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

src: portability updates

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2024-07-07 14:50:27 +02:00
parent 285472bc78
commit 16c8f6d160
21 changed files with 700 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_lx_elf.cpp
+7 -2
View File
@@ -43,6 +43,11 @@
#include "p_lx_elf.h"
#include "ui.h"
#if defined(__CHERI__) && defined(__CHERI_PURE_CAPABILITY__)
# pragma clang diagnostic ignored "-Wcheri-capability-misuse" // TODO later
# pragma clang diagnostic ignored "-Wcheri-provenance" // TODO later
#endif
using upx::umin;
#define PT_LOAD32 Elf32_Phdr::PT_LOAD
@@ -5068,7 +5073,7 @@ int PackLinuxElf32::pack2(OutputFile *fo, Filter &ft)
asl_pack2_Shdrs(fo, pre_xct_top);
}
else { // Just copy up to xct_off
x.size = umin(0ull + x.size, 0ull + xct_off - x.offset);
x.size = umin(uintmax_t(x.size), uintmax_t(0ull + xct_off - x.offset));
if (0) { // DEBUG paranoia
fi->seek(x.offset, SEEK_SET);
fi->readx(ibuf, x.size);
@@ -5328,7 +5333,7 @@ int PackLinuxElf64::pack2(OutputFile *fo, Filter &ft)
asl_pack2_Shdrs(fo, pre_xct_top);
}
else { // Just copy up to xct_off
x.size = umin(0ull + x.size, 0ull + xct_off - x.offset);
x.size = umin(uintmax_t(x.size), uintmax_t(0ull + xct_off - x.offset));
if (0) { // DEBUG paranoia
fi->seek(x.offset, SEEK_SET);
fi->readx(ibuf, x.size);