diff --git a/.clang-tidy b/.clang-tidy index e53a3008..bc84c3f0 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -22,6 +22,7 @@ Checks: > -bugprone-switch-missing-default-case, clang-analyzer-*, -clang-analyzer-core.CallAndMessage, + -clang-analyzer-deadcode.DeadStores, -clang-analyzer-optin.performance.Padding, -clang-analyzer-security.PointerSub, -clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling, diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cb844f82..257fc52b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,8 +19,8 @@ env: UPX_DEBUG_TEST_FLOAT_DIVISION_BY_ZERO: 1 UPX_DEBUG_TEST_LIBC_QSORT: 1 ZSTD_CLEVEL: 9 - # 2025-01-08 - ZIG_DIST_VERSION: 0.14.0-dev.2627+6a21d18ad + # 2025-01-20 + ZIG_DIST_VERSION: 0.14.0-dev.2847+db8ed730e jobs: job-rebuild-and-verify-stubs: diff --git a/CMakeLists.txt b/CMakeLists.txt index c1b99657..f9dbbdfa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -261,9 +261,9 @@ endif() #*********************************************************************** # internal settings; these may change in a future versions -set(UPX_CONFIG_DISABLE_THREADS ON) # multithreading is currently not used; maybe in UPX version 5 +set(UPX_CONFIG_DISABLE_THREADS ON) # multithreading is currently not used; maybe in UPX version 6 set(UPX_CONFIG_DISABLE_BZIP2 ON) # bzip2 is currently not used; we might need it to decompress linux kernels -set(UPX_CONFIG_DISABLE_ZSTD ON) # zstd is currently not used; maybe in UPX version 5 +set(UPX_CONFIG_DISABLE_ZSTD ON) # zstd is currently not used; maybe in UPX version 6 upx_cmake_include_hook(4_targets) diff --git a/src/util/membuffer.cpp b/src/util/membuffer.cpp index b9f406e3..47f2d6dc 100644 --- a/src/util/membuffer.cpp +++ b/src/util/membuffer.cpp @@ -177,6 +177,8 @@ void MemBuffer::alloc(upx_uint64_t bytes) may_throw { size_t malloc_bytes = mem_size(1, bytes); // check size if (use_simple_mcheck()) malloc_bytes += 32; + else + malloc_bytes += 4; byte *p = (byte *) ::malloc(malloc_bytes); NO_printf("MemBuffer::alloc %llu: %p\n", bytes, p); if (!p) diff --git a/src/version.h b/src/version.h index a2ca301a..520a5e54 100644 --- a/src/version.h +++ b/src/version.h @@ -2,6 +2,6 @@ #define UPX_VERSION_HEX 0x050000 /* 05.00.00 */ #define UPX_VERSION_STRING "5.0.0" #define UPX_VERSION_STRING4 "5.00" -#define UPX_VERSION_DATE "Jan 17th 2025" +#define UPX_VERSION_DATE "Jan 18th 2025" #define UPX_VERSION_DATE_ISO "2025-01-18" #define UPX_VERSION_YEAR "2025"