jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Run clang-format.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2020-12-03 02:15:14 +01:00
parent bd193201b2
commit 8f7ac520eb
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/packhead.cpp
+4 -7
View File
@@ -190,9 +190,8 @@ bool PackHeader::fillPackHeader(const upx_bytep buf, int blen) {
fprintf(stderr, " fillPackHeader version=%d format=%d method=%d level=%d\n", version, fprintf(stderr, " fillPackHeader version=%d format=%d method=%d level=%d\n", version,
format, method, level); format, method, level);
} }
if (0==format || 128==format if (0 == format || 128 == format || (format < 128 && format > UPX_F_LINUX_ELF64_ARM) ||
|| (format < 128 && format > UPX_F_LINUX_ELF64_ARM) (format > 128 && format > UPX_F_DYLIB_PPC64)) {
|| (format > 128 && format > UPX_F_DYLIB_PPC64)) {
char msg[24]; char msg[24];
snprintf(msg, sizeof(msg), "unknown format %d", format); snprintf(msg, sizeof(msg), "unknown format %d", format);
throwCantUnpack(msg); throwCantUnpack(msg);
@@ -255,8 +254,7 @@ bool PackHeader::fillPackHeader(const upx_bytep buf, int blen) {
throwCantUnpack("header corrupted 9"); throwCantUnpack("header corrupted 9");
} }
filter = p[off_filter]; filter = p[off_filter];
} } else if ((level & 128) == 0)
else if ((level & 128) == 0)
filter = 0; filter = 0;
else { else {
// convert old flags to new filter id // convert old flags to new filter id
@@ -278,8 +276,7 @@ bool PackHeader::fillPackHeader(const upx_bytep buf, int blen) {
// check header_checksum // check header_checksum
if (version > 9) { if (version > 9) {
unsigned const size = getPackHeaderSize(); // expected; based on format and version unsigned const size = getPackHeaderSize(); // expected; based on format and version
if (headway < size if (headway < size || p[size - 1] != get_packheader_checksum(p, size - 1))
|| p[size - 1] != get_packheader_checksum(p, size - 1))
throwCantUnpack("header corrupted 3"); throwCantUnpack("header corrupted 3");
} }