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

--brute versus forced_method(ph.method)

Browse Source 
https://github.com/upx/upx/issues/694  (partial)
	modified:   p_lx_elf.cpp
This commit is contained in:
John Reiser
2023-08-11 01:48:57 -07:00
committed by Markus F.X.J. Oberhumer
parent 7636abc158
commit 149d84edca
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_lx_elf.cpp
+2 -2
View File
@@ -1445,7 +1445,7 @@ PackLinuxElf32::buildLinuxLoader(
// SO_MAIN C-language supervision based on PT_LOADs // SO_MAIN C-language supervision based on PT_LOADs
char sec[120]; char sec[120];
int len = 0; int len = 0;
unsigned m_decompr = (methods_used ? methods_used : (1u << ph.method)); unsigned m_decompr = (methods_used ? methods_used : (1u << forced_method(ph.method)));
len += snprintf(sec, sizeof(sec), "%s", "SO_HEAD,ptr_NEXT,EXP_HEAD"); len += snprintf(sec, sizeof(sec), "%s", "SO_HEAD,ptr_NEXT,EXP_HEAD");
if (((1u<<M_NRV2B_LE32)|(1u<<M_NRV2B_8)|(1u<<M_NRV2B_LE16)) & m_decompr) { if (((1u<<M_NRV2B_LE32)|(1u<<M_NRV2B_8)|(1u<<M_NRV2B_LE16)) & m_decompr) {
len += snprintf(&sec[len], sizeof(sec) - len, ",%s", "NRV2B"); len += snprintf(&sec[len], sizeof(sec) - len, ",%s", "NRV2B");
@@ -1553,7 +1553,7 @@ PackLinuxElf64::buildLinuxLoader(
// SO_MAIN C-language supervision based on PT_LOADs // SO_MAIN C-language supervision based on PT_LOADs
char sec[120]; char sec[120];
int len = 0; int len = 0;
unsigned m_decompr = (methods_used ? methods_used : (1u << ph.method)); unsigned m_decompr = (methods_used ? methods_used : (1u << forced_method(ph.method)));
len += snprintf(sec, sizeof(sec), "%s", "SO_HEAD,ptr_NEXT,EXP_HEAD"); len += snprintf(sec, sizeof(sec), "%s", "SO_HEAD,ptr_NEXT,EXP_HEAD");
if (((1u<<M_NRV2B_LE32)|(1u<<M_NRV2B_8)|(1u<<M_NRV2B_LE16)) & m_decompr) { if (((1u<<M_NRV2B_LE32)|(1u<<M_NRV2B_8)|(1u<<M_NRV2B_LE16)) & m_decompr) {
len += snprintf(&sec[len], sizeof(sec) - len, ",%s", "NRV2B"); len += snprintf(&sec[len], sizeof(sec) - len, ",%s", "NRV2B");