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

src: try to fix canUnpack() confusion - see packer.h

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2022-11-10 06:00:53 +01:00
parent d7508d8c09
commit 16de3e78a5
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_lx_elf.cpp
+4 -4
View File
@@ -1978,7 +1978,7 @@ bool PackLinuxElf32::calls_crt1(Elf32_Rel const *rel, int sz)
#include "p_elf_enum.h"
#undef WANT_REL_ENUM
int PackLinuxElf32::canUnpack() // really 'bool'
int PackLinuxElf32::canUnpack() // bool, except -1: format known, but not packed
{
if (checkEhdr(&ehdri)) {
return false;
@@ -2409,7 +2409,7 @@ proceed: ;
return true;
}
int PackLinuxElf64::canUnpack() // really 'bool'
int PackLinuxElf64::canUnpack() // bool, except -1: format known, but not packed
{
if (checkEhdr(&ehdri)) {
return false;
@@ -2497,7 +2497,7 @@ PackLinuxElf64::canPack()
max_offset = UPX_MAX(max_offset, get_te64(&phdr->p_filesz) + get_te64(&phdr->p_offset));
}
}
if (canUnpack()) {
if (canUnpack() > 0) {
throwAlreadyPacked();
}
// We want to compress position-independent executable (gcc -pie)
@@ -5340,7 +5340,7 @@ PackLinuxElf32x86::~PackLinuxElf32x86()
{
}
int PackLinuxElf32x86::canUnpack() // really 'bool'
int PackLinuxElf32x86::canUnpack() // bool, except -1: format known, but not packed
{
if (super::canUnpack()) {
return true;