From 149d84edca2b349e704dc52237f36f872a948d96 Mon Sep 17 00:00:00 2001
From: John Reiser <jreiser@BitWagon.com>
Date: Fri, 11 Aug 2023 01:48:57 -0700
Subject: [PATCH] --brute versus forced_method(ph.method)

https://github.com/upx/upx/issues/694  (partial)
	modified:   p_lx_elf.cpp
---
 src/p_lx_elf.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp
index 95b56eff..179b6716 100644
--- a/src/p_lx_elf.cpp
+++ b/src/p_lx_elf.cpp
@@ -1445,7 +1445,7 @@ PackLinuxElf32::buildLinuxLoader(
 //   SO_MAIN  C-language supervision based on PT_LOADs
         char sec[120];
         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");
         if (((1u<<M_NRV2B_LE32)|(1u<<M_NRV2B_8)|(1u<<M_NRV2B_LE16)) & m_decompr) {
             len += snprintf(&sec[len], sizeof(sec) - len, ",%s", "NRV2B");
@@ -1553,7 +1553,7 @@ PackLinuxElf64::buildLinuxLoader(
 //   SO_MAIN  C-language supervision based on PT_LOADs
         char sec[120];
         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");
         if (((1u<<M_NRV2B_LE32)|(1u<<M_NRV2B_8)|(1u<<M_NRV2B_LE16)) & m_decompr) {
             len += snprintf(&sec[len], sizeof(sec) - len, ",%s", "NRV2B");