andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix heap use after free ASAN/Valgrind

Browse Source 
Summary:
Dont use c_str() of temp std::string in RocksLuaCompactionFilter::Name()
Closes https://github.com/facebook/rocksdb/pull/1535

Differential Revision: D4199094

Pulled By: IslamAbdelRahman

fbshipit-source-id: e56ce62
This commit is contained in:
Islam AbdelRahman 2016-11-17 12:02:40 -08:00 committed by Facebook Github Bot
parent a4eb7387b2
commit f39452e81f
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/rocksdb/utilities/lua/rocks_lua_compaction_filter.h
View File

@ -161,7 +161,8 @@ class RocksLuaCompactionFilter : public rocksdb::CompactionFilter {
explicit RocksLuaCompactionFilter(const RocksLuaCompactionFilterOptions& opt) explicit RocksLuaCompactionFilter(const RocksLuaCompactionFilterOptions& opt)
: options_(opt), : options_(opt),
lua_state_wrapper_(opt.lua_script, opt.libraries), lua_state_wrapper_(opt.lua_script, opt.libraries),
error_count_(0) {} error_count_(0),
name_("") {}
virtual bool Filter(int level, const Slice& key, const Slice& existing_value, virtual bool Filter(int level, const Slice& key, const Slice& existing_value,
std::string* new_value, std::string* new_value,
@ -180,6 +181,7 @@ class RocksLuaCompactionFilter : public rocksdb::CompactionFilter {
RocksLuaCompactionFilterOptions options_; RocksLuaCompactionFilterOptions options_;
LuaStateWrapper lua_state_wrapper_; LuaStateWrapper lua_state_wrapper_;
mutable int error_count_; mutable int error_count_;
mutable std::string name_;
}; };
} // namespace lua } // namespace lua

10
utilities/lua/rocks_lua_compaction_filter.cc
View File

@ -134,7 +134,9 @@ bool RocksLuaCompactionFilter::Filter(int level, const Slice& key,
} }
const char* RocksLuaCompactionFilter::Name() const { const char* RocksLuaCompactionFilter::Name() const {
std::string name = ""; if (name_ != "") {
return name_.c_str();
}
auto* lua_state = lua_state_wrapper_.GetLuaState(); auto* lua_state = lua_state_wrapper_.GetLuaState();
// push the right function into the lua stack // push the right function into the lua stack
lua_getglobal(lua_state, kNameFunctionName.c_str()); lua_getglobal(lua_state, kNameFunctionName.c_str());
@ -146,7 +148,7 @@ const char* RocksLuaCompactionFilter::Name() const {
lua_tostring(lua_state, -1)); lua_tostring(lua_state, -1));
// pops out the lua error from stack // pops out the lua error from stack
lua_pop(lua_state, 1); lua_pop(lua_state, 1);
return name.c_str(); return name_.c_str();
} }
// check the return value // check the return value
@ -159,10 +161,10 @@ const char* RocksLuaCompactionFilter::Name() const {
const size_t name_size = lua_strlen(lua_state, -1); const size_t name_size = lua_strlen(lua_state, -1);
assert(name_buf[name_size] == '\0'); assert(name_buf[name_size] == '\0');
assert(strlen(name_buf) <= name_size); assert(strlen(name_buf) <= name_size);
name = name_buf; name_ = name_buf;
} }
lua_pop(lua_state, 1); lua_pop(lua_state, 1);
return name.c_str(); return name_.c_str();
} }
/* Not yet supported /* Not yet supported