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

0==e_shnum obviates testing of e_shoff

Browse Source 
modified:   p_lx_elf.cpp
This commit is contained in:
John Reiser
2020-07-26 20:00:05 -07:00
parent 624eb22d74
commit ebe4d2b78f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_lx_elf.cpp
+4 -3
View File
@@ -269,7 +269,7 @@ PackLinuxElf32::PackLinuxElf32help1(InputFile *f)
e_shoff = get_te32(&ehdri.e_shoff); e_shoff = get_te32(&ehdri.e_shoff);
unsigned const last_Shdr = e_shoff + e_shnum * sizeof(Elf32_Shdr); unsigned const last_Shdr = e_shoff + e_shnum * sizeof(Elf32_Shdr);
if (last_Shdr < e_shoff // wrap-around if (last_Shdr < e_shoff // wrap-around
|| e_shoff < last_Phdr || (e_shnum && e_shoff < last_Phdr)
|| (unsigned long)file_size < last_Shdr) { || (unsigned long)file_size < last_Shdr) {
if (opt->cmd == CMD_COMPRESS) { if (opt->cmd == CMD_COMPRESS) {
throwCantUnpack("bad e_shoff"); throwCantUnpack("bad e_shoff");
@@ -771,7 +771,7 @@ PackLinuxElf64::PackLinuxElf64help1(InputFile *f)
e_shoff = get_te64(&ehdri.e_shoff); e_shoff = get_te64(&ehdri.e_shoff);
upx_uint64_t const last_Shdr = e_shoff + e_shnum * sizeof(Elf64_Shdr); upx_uint64_t const last_Shdr = e_shoff + e_shnum * sizeof(Elf64_Shdr);
if (last_Shdr < e_shoff // wrap-around if (last_Shdr < e_shoff // wrap-around
|| e_shoff < last_Phdr || (e_shnum && e_shoff < last_Phdr)
|| (unsigned long)file_size < last_Shdr) { || (unsigned long)file_size < last_Shdr) {
if (opt->cmd == CMD_COMPRESS) { if (opt->cmd == CMD_COMPRESS) {
throwCantUnpack("bad e_shoff"); throwCantUnpack("bad e_shoff");
@@ -2693,8 +2693,9 @@ PackLinuxElf64::canPack()
} }
goto proceed; // But proper packing depends on checking xct_va. goto proceed; // But proper packing depends on checking xct_va.
} }
else else {
throwCantPack("need DT_INIT; try \"void _init(void){}\""); throwCantPack("need DT_INIT; try \"void _init(void){}\"");
}
abandon: abandon:
return false; return false;
proceed: ; proceed: ;