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

tweaks: some extra checks on lengths

Browse Source
This commit is contained in:
Liam Murphy 2020-11-05 04:43:40 +00:00 committed by Markus F.X.J. Oberhumer
parent 4f3054f07d
commit 4702f12818
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/packhead.cpp
View File

@ -42,6 +42,7 @@ PackHeader::PackHeader() : version(-1), format(-1) {}
**************************************************************************/
static unsigned char get_packheader_checksum(const upx_bytep buf, int len) {
assert(len >= sizeof(int32_t));
assert(get_le32(buf) == UPX_MAGIC_LE32);
// printf("1 %d\n", len);
buf += 4;
@ -92,6 +93,8 @@ int PackHeader::getPackHeaderSize() const {
**************************************************************************/
void PackHeader::putPackHeader(upx_bytep p) {
// NOTE: It is the caller's responsbility to ensure the buffer p has
// sufficient space for the header.
assert(get_le32(p) == UPX_MAGIC_LE32);
if (get_le32(p + 4) != UPX_MAGIC2_LE32) {
// fprintf(stderr, "MAGIC2_LE32: %x %x\n", get_le32(p+4), UPX_MAGIC2_LE32);

3
src/util.cpp
View File

@ -241,6 +241,9 @@ int __acc_cdecl_qsort le64_compare_signed(const void *e1, const void *e2) {
int find(const void *b, int blen, const void *what, int wlen) {
if (b == NULL || blen <= 0 || what == NULL || wlen <= 0)
return -1;
// Fast exit if the wanted string is longer than the buffer.
if (wlen > blen)
return -1;
int i;
const unsigned char *base = (const unsigned char *) b;