i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ReaderImplBase: Fix strings subsection validity check

Browse Source 
A strings section with 0 strings is still 1 byte long. Also improve the
error output in the error case.
This commit is contained in:
Ingo Weinhold
2013-05-25 01:12:29 +02:00
parent 521545f7fb
commit 1559102fe7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/package/hpkg/ReaderImplBase.cpp
+3 -3
View File
@@ -617,11 +617,11 @@ ReaderImplBase::InitSection(PackageFileSection& section, uint64 endOffset,
} }
// check strings subsection size/count // check strings subsection size/count
if ((stringsLength == 0) != (stringsCount == 0) || stringsLength > length) { if ((stringsLength <= 1) != (stringsCount == 0) || stringsLength > length) {
ErrorOutput()->PrintError("Error: strings subsection description of %s " ErrorOutput()->PrintError("Error: strings subsection description of %s "
"file %s section is invalid (%" B_PRIu64 " strings, length: %" "file %s section is invalid (%" B_PRIu64 " strings, length: %"
B_PRIu64 ")\n", B_PRIu64 ", section length: %" B_PRIu64 ")\n",
fFileType, section.name, length, stringsCount, stringsLength); fFileType, section.name, stringsCount, stringsLength, length);
return B_BAD_DATA; return B_BAD_DATA;
} }