MW-175 Fix definitively lost memory in wsrep_get_params

33aaee8e · Daniele Sciascia · Sachin Setiya · 1d4cc423 · 33aaee8e · 33aaee8e
Commit 33aaee8e authored May 18, 2016 by Daniele Sciascia Committed by Sachin Setiya Apr 18, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

sql/wsrep_var.cc sql/wsrep_var.cc +2 -3

wsrep/wsrep_dummy.c wsrep/wsrep_dummy.c +1 -1

No files found.
--- 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_init(opts);
-    wsrep_provider_options = (char*)my_memdup(opts, strlen(opts) + 1, 
+    free(opts);
-                                              MYF(MY_WME));
  }
  else
  {

--- 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(