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

CI updates

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer 2025-12-10 12:30:09 +01:00
parent 190fd76583
commit 669bf2251f
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@ -633,9 +633,9 @@ jobs:
- { zig_target: x86_64-windows-gnu } - { zig_target: x86_64-windows-gnu }
name: ${{ format('zigcc {0} {1}', matrix.zig_target, matrix.zig_pic) }} name: ${{ format('zigcc {0} {1}', matrix.zig_target, matrix.zig_pic) }}
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: ${{ matrix.container || 'alpine:3.23' }} container: ${{ matrix.container || 'alpine:3.22' }}
env: env:
container: ${{ matrix.container || 'alpine:3.23' }} container: ${{ matrix.container || 'alpine:3.22' }}
UPX_CONFIG_HAVE_WORKING_BUILD_RPATH: '' UPX_CONFIG_HAVE_WORKING_BUILD_RPATH: ''
# for zig-cc wrapper scripts (see below): # for zig-cc wrapper scripts (see below):
ZIG_CPPFLAGS: -DUPX_DOCTEST_CONFIG_MULTITHREADING ZIG_CPPFLAGS: -DUPX_DOCTEST_CONFIG_MULTITHREADING

2
src/linker.cpp
View File

@ -368,7 +368,7 @@ int ElfLinker::addLoader(const char *sname) {
char *begin = strdup(sname); char *begin = strdup(sname);
assert(begin != nullptr); assert(begin != nullptr);
auto begin_deleter = upx::MallocDeleter(&begin, 1); const auto begin_deleter = upx::MallocDeleter(&begin, 1); // don't leak memory
char *end = begin + strlen(begin); char *end = begin + strlen(begin);
for (char *sect = begin; sect < end;) { for (char *sect = begin; sect < end;) {
for (char *tokend = sect; *tokend; tokend++) for (char *tokend = sect; *tokend; tokend++)

4
src/pefile.cpp
View File

@ -1737,14 +1737,16 @@ PeFile::Resource::upx_rnode *PeFile::Resource::convert(const void *rnode, upx_rn
branch->parent = parent; branch->parent = parent;
branch->nc = ic; branch->nc = ic;
branch->children = New(upx_rnode *, ic); branch->children = New(upx_rnode *, ic);
// NOLINTNEXTLINE(bugprone-multi-level-implicit-pointer-conversion)
memset(branch->children, 0, sizeof(upx_rnode *) * ic);
branch->data = *node; branch->data = *node;
if (!root) // first one if (!root) // first one
root = branch; // prevent leak if xcheck throws (hacked unpack or test) root = branch; // prevent leak if xcheck throws (hacked unpack or test)
for (const res_dir_entry *rde = node->entries + ic - 1; --ic >= 0; rde--) { for (const res_dir_entry *rde = node->entries + ic - 1; --ic >= 0; rde--) {
upx_rnode *child = convert(start + (rde->child & 0x7fffffff), branch, level + 1); upx_rnode *child = convert(start + (rde->child & 0x7fffffff), branch, level + 1);
xcheck(child);
branch->children[ic] = child; branch->children[ic] = child;
xcheck(child);
child->id = rde->tnl; child->id = rde->tnl;
if (child->id & 0x80000000) { if (child->id & 0x80000000) {
const byte *p = start + (child->id & 0x7fffffff); const byte *p = start + (child->id & 0x7fffffff);