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

Fix nullptr dereference in adaptive_table

Browse Source 
Summary:
@dulmarod Ran infer on RocksDB and found that we dereference nullptr in adaptive_table
https://fb.facebook.com/groups/rocksdb/permalink/1046374415411173/

Test Plan: make check -j64

Reviewers: sdong, yhchiang, andrewkr

Reviewed By: andrewkr

Subscribers: andrewkr, dhruba

Differential Revision: https://reviews.facebook.net/D56973
This commit is contained in:
Islam AbdelRahman 2016-04-19 13:57:05 -07:00
parent 9385fd72c0
commit 6356b4d516
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
table/adaptive_table_factory.cc
View File

@ -78,25 +78,25 @@ std::string AdaptiveTableFactory::GetPrintableTableOptions() const {
const int kBufferSize = 200; const int kBufferSize = 200;
char buffer[kBufferSize]; char buffer[kBufferSize];
if (!table_factory_to_write_) { if (table_factory_to_write_) {
snprintf(buffer, kBufferSize, " write factory (%s) options:\n%s\n", snprintf(buffer, kBufferSize, " write factory (%s) options:\n%s\n",
table_factory_to_write_->Name(), table_factory_to_write_->Name(),
table_factory_to_write_->GetPrintableTableOptions().c_str()); table_factory_to_write_->GetPrintableTableOptions().c_str());
ret.append(buffer); ret.append(buffer);
} }
if (!plain_table_factory_) { if (plain_table_factory_) {
snprintf(buffer, kBufferSize, " %s options:\n%s\n", snprintf(buffer, kBufferSize, " %s options:\n%s\n",
plain_table_factory_->Name(), plain_table_factory_->Name(),
plain_table_factory_->GetPrintableTableOptions().c_str()); plain_table_factory_->GetPrintableTableOptions().c_str());
ret.append(buffer); ret.append(buffer);
} }
if (!block_based_table_factory_) { if (block_based_table_factory_) {
snprintf(buffer, kBufferSize, " %s options:\n%s\n", snprintf(buffer, kBufferSize, " %s options:\n%s\n",
block_based_table_factory_->Name(), block_based_table_factory_->Name(),
block_based_table_factory_->GetPrintableTableOptions().c_str()); block_based_table_factory_->GetPrintableTableOptions().c_str());
ret.append(buffer); ret.append(buffer);
} }
if (!cuckoo_table_factory_) { if (cuckoo_table_factory_) {
snprintf(buffer, kBufferSize, " %s options:\n%s\n", snprintf(buffer, kBufferSize, " %s options:\n%s\n",
cuckoo_table_factory_->Name(), cuckoo_table_factory_->Name(),
cuckoo_table_factory_->GetPrintableTableOptions().c_str()); cuckoo_table_factory_->GetPrintableTableOptions().c_str());