github-repos/leveldb
1
0
Fork 0
mirror of https://github.com/google/leveldb.git synced 2026-08-18 10:33:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upstream changes.

Browse Source 
git-svn-id: https://leveldb.googlecode.com/svn/trunk@16 62dab493-f737-651d-591e-8d6aee1b9529
This commit is contained in:
jorlow@chromium.org
2011-03-28 20:43:44 +00:00
parent e11bdf1935
commit e2da744e12
17 changed files with 67 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
db/log_reader.cc
View File

@@ -105,7 +105,7 @@ void Reader::ReportDrop(size_t bytes, const char* reason) {
unsigned int Reader::ReadPhysicalRecord(Slice* result) {
while (true) {
if (buffer_.size() <= kHeaderSize) {
if (buffer_.size() < kHeaderSize) {
if (!eof_) {
// Last read was a full read, so this is a trailer to skip
buffer_.clear();
@@ -124,12 +124,10 @@ unsigned int Reader::ReadPhysicalRecord(Slice* result) {
} else if (buffer_.size() == 0) {
// End of file
return kEof;
} else if (buffer_.size() < kHeaderSize) {
} else {
ReportDrop(buffer_.size(), "truncated record at end of file");
buffer_.clear();
return kEof;
} else {
// We have a trailing zero-length record. Fall through and check it.
}
}