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

Fix null-pointer-dereference detected by Infer (https://github.com/facebook/infer)

Browse Source 
Test Plan: make check

Reviewers: leveldb, sdong

Reviewed By: sdong

Subscribers: leveldb, andrewkr, dhruba

Differential Revision: https://reviews.facebook.net/D57165
This commit is contained in:
Dhruba Borthakur 2016-04-25 14:27:27 +01:00
parent 24110ce90c
commit 995353e46a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
table/adaptive_table_factory.cc
View File

@ -80,25 +80,28 @@ std::string AdaptiveTableFactory::GetPrintableTableOptions() const {
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_->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_->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(
block_based_table_factory_->Name(), buffer, kBufferSize, " %s options:\n%s\n",
block_based_table_factory_->GetPrintableTableOptions().c_str()); (block_based_table_factory_->Name() ? block_based_table_factory_->Name()
: ""),
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_->Name() : "",
cuckoo_table_factory_->GetPrintableTableOptions().c_str()); cuckoo_table_factory_->GetPrintableTableOptions().c_str());
ret.append(buffer); ret.append(buffer);
} }