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

Fix analyze error on possible un-initialized value (#4937)

Browse Source 
Summary:
The patch fixes the following analyze error by checking the return status of ParseInternalKey.
```
db/merge_helper.cc:306:23: warning: The right operand of '==' is a garbage value
    assert(kTypeMerge == orig_ikey.type);
```
Pull Request resolved: https://github.com/facebook/rocksdb/pull/4937

Differential Revision: D13908506

Pulled By: maysamyabandeh

fbshipit-source-id: 68d7771e75519da3d4bd807fd231675ec12093f6
This commit is contained in:
Maysam Yabandeh 2019-02-01 09:38:00 -08:00 committed by Facebook Github Bot
parent 59244447e3
commit 30468d8eb4
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
db/merge_helper.cc
View File

@ -138,7 +138,11 @@ Status MergeHelper::MergeUntil(InternalIterator* iter,
// orig_ikey is backed by original_key if keys_.empty()
// orig_ikey is backed by keys_.back() if !keys_.empty()
ParsedInternalKey orig_ikey;
ParseInternalKey(original_key, &orig_ikey);
bool succ = ParseInternalKey(original_key, &orig_ikey);
assert(succ);
if (!succ) {
return Status::Corruption("Cannot parse key in MergeUntil");
}
Status s;
bool hit_the_next_user_key = false;