summaryrefslogtreecommitdiffstats
path: root/file_index.cc
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 11:51:28 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 11:51:28 +0000
commit79cd96ee549de2d24d5ba81d6f8fa4d642943b52 (patch)
tree61504e983e7adf383ff88c409233c92e5ff9ed4a /file_index.cc
parentAdding debian version 1.17~rc1-1. (diff)
downloadlziprecover-79cd96ee549de2d24d5ba81d6f8fa4d642943b52.tar.xz
lziprecover-79cd96ee549de2d24d5ba81d6f8fa4d642943b52.zip
Merging upstream version 1.17~rc2.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'file_index.cc')
-rw-r--r--file_index.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/file_index.cc b/file_index.cc
index de685a3..49511bf 100644
--- a/file_index.cc
+++ b/file_index.cc
@@ -85,8 +85,8 @@ File_index::File_index( const int infd )
const long long member_size = trailer.member_size();
if( member_size < min_member_size || member_size > pos )
{
- if( member_vector.empty() ) // maybe trailing garbage
- { --pos; continue; }
+ if( member_vector.empty() )
+ { --pos; continue; } // maybe trailing garbage
set_num_error( "Member size in trailer is corrupt at pos ", pos - 8 );
break;
}
@@ -95,8 +95,8 @@ File_index::File_index( const int infd )
{ set_errno_error( "Error reading member header: " ); break; }
if( !header.verify_magic() || !header.verify_version() )
{
- if( member_vector.empty() ) // maybe trailing garbage
- { --pos; continue; }
+ if( member_vector.empty() )
+ { --pos; continue; } // maybe trailing garbage
set_num_error( "Bad header at pos ", pos - member_size );
break;
}