mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-10-05 19:20:23 +08:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/packhead.cpp
View File

@ -66,7 +66,7 @@ int PackHeader::getPackHeaderSize() const {
throwInternalError("getPackHeaderSize"); throwInternalError("getPackHeaderSize");
int n = 0; int n = 0;
if (version <= 3) // Note: covers (version <= 0) if (version <= 3) // Note: covers (version <= 0)
n = 24; n = 24;
else if (version <= 9) { else if (version <= 9) {
if (format == UPX_F_DOS_COM || format == UPX_F_DOS_SYS) if (format == UPX_F_DOS_COM || format == UPX_F_DOS_SYS)
@ -176,9 +176,9 @@ bool PackHeader::fillPackHeader(const upx_bytep buf, int blen) {
return false; return false;
const upx_bytep const p = buf + boff; const upx_bytep const p = buf + boff;
unsigned const headway = blen - boff; // bytes remaining in buf unsigned const headway = blen - boff; // bytes remaining in buf
if (headway < (1+ 7)) if (headway < (1 + 7))
throwCantUnpack("header corrupted 1"); throwCantUnpack("header corrupted 1");
version = p[4]; version = p[4];
format = p[5]; format = p[5];
@ -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);
@ -226,7 +225,7 @@ bool PackHeader::fillPackHeader(const upx_bytep buf, int blen) {
u_file_size = get_le24(p + 22); u_file_size = get_le24(p + 22);
off_filter = 25; off_filter = 25;
} else { } else {
if (headway < (3+ 28)) { if (headway < (3 + 28)) {
throwCantUnpack("header corrupted 7"); throwCantUnpack("header corrupted 7");
} }
u_len = get_le32(p + 16); u_len = get_le32(p + 16);
@ -237,7 +236,7 @@ bool PackHeader::fillPackHeader(const upx_bytep buf, int blen) {
n_mru = p[30] ? 1 + p[30] : 0; n_mru = p[30] ? 1 + p[30] : 0;
} }
} else { } else {
if (headway < (3+ 28)) { if (headway < (3 + 28)) {
throwCantUnpack("header corrupted 8"); throwCantUnpack("header corrupted 8");
} }
u_len = get_be32(p + 8); u_len = get_be32(p + 8);
@ -251,12 +250,11 @@ bool PackHeader::fillPackHeader(const upx_bytep buf, int blen) {
} }
if (version >= 10) { if (version >= 10) {
if (headway < (1+ off_filter)) { if (headway < (1 + off_filter)) {
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
@ -277,9 +275,8 @@ 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");
} }