MW-175 Fix definitively lost memory in wsrep_get_params

MariaDB · Apr 18, 2017 · 33aaee8 · 33aaee8
1 parent 1d4cc42
commit 33aaee8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc
@@ -185,9 +185,8 @@ static bool refresh_provider_options()
   char* opts= wsrep->options_get(wsrep);
   if (opts)
   {
-    if (wsrep_provider_options) my_free((void *)wsrep_provider_options);
-    wsrep_provider_options = (char*)my_memdup(opts, strlen(opts) + 1, 
-                                              MYF(MY_WME));
+    wsrep_provider_options_init(opts);
+    free(opts);
   }
   else
   {

diff --git a/wsrep/wsrep_dummy.c b/wsrep/wsrep_dummy.c
@@ -86,7 +86,7 @@ static wsrep_status_t dummy_options_set(
 static char* dummy_options_get (wsrep_t* w)
 {
     WSREP_DBUG_ENTER(w);
-    return WSREP_DUMMY(w)->options;
+    return strdup(WSREP_DUMMY(w)->options);
 }
 
 static wsrep_status_t dummy_connect(