1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed memory leak in my_rocks

Browse Source 
rocksdb_sys_vars.rocksdb_update_cf_options_basic.test failed with
reports about not freed memory.
This commit is contained in:
Monty 2017-12-17 17:53:53 +02:00
parent 4bd63bd551
commit 06f0b23a78
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/rocksdb/ha_rocksdb.cc
View File

@ -12337,6 +12337,7 @@ void rocksdb_set_update_cf_options(THD *const /* unused */,
// Basic sanity checking and parsing the options into a map. If this fails // Basic sanity checking and parsing the options into a map. If this fails
// then there's no point to proceed. // then there's no point to proceed.
if (!Rdb_cf_options::parse_cf_options(val, &option_map)) { if (!Rdb_cf_options::parse_cf_options(val, &option_map)) {
my_free(*reinterpret_cast<char**>(var_ptr));
*reinterpret_cast<char**>(var_ptr) = nullptr; *reinterpret_cast<char**>(var_ptr) = nullptr;
// NO_LINT_DEBUG // NO_LINT_DEBUG
@ -12405,6 +12406,7 @@ void rocksdb_set_update_cf_options(THD *const /* unused */,
// the CF options. This will results in consistent behavior and avoids // the CF options. This will results in consistent behavior and avoids
// dealing with cases when only a subset of CF-s was successfully updated. // dealing with cases when only a subset of CF-s was successfully updated.
if (val) { if (val) {
my_free(*reinterpret_cast<char**>(var_ptr));
*reinterpret_cast<char**>(var_ptr) = my_strdup(val, MYF(0)); *reinterpret_cast<char**>(var_ptr) = my_strdup(val, MYF(0));
} else { } else {
*reinterpret_cast<char**>(var_ptr) = nullptr; *reinterpret_cast<char**>(var_ptr) = nullptr;