diff options
| author | Daniele Sciascia <daniele.sciascia@galeracluster.com> | 2016-05-18 11:07:58 +0200 |
|---|---|---|
| committer | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-04-18 11:51:24 +0530 |
| commit | 33aaee8ee997dc76a9148d96ebe0d40b2830ddd9 (patch) | |
| tree | 7bdf69c5df97187d1268489d168664fb922c0784 | |
| parent | 1d4cc423886201d9d373e17bb29d667ab8a5f503 (diff) | |
| download | mariadb-git-33aaee8ee997dc76a9148d96ebe0d40b2830ddd9.tar.gz | |
MW-175 Fix definitively lost memory in wsrep_get_params
| -rw-r--r-- | sql/wsrep_var.cc | 5 | ||||
| -rw-r--r-- | wsrep/wsrep_dummy.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc index 66b33e7697c..6385fa926a2 100644 --- 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 index bab5329dc02..5f1ea63cc40 100644 --- 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( |