From 839936aa33eb8899bbbd80fda02796bb65068951 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sun, 5 Apr 2026 13:25:27 +0200 Subject: [PATCH 1/2] opj_pi_initialise_encode() (write code path): avoid potential integer overflow leading to insufficient memory allocation Fixes #1619 --- src/lib/openjp2/pi.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c index 15ac33142..4abb87af2 100644 --- a/src/lib/openjp2/pi.c +++ b/src/lib/openjp2/pi.c @@ -1694,9 +1694,12 @@ opj_pi_iterator_t *opj_pi_initialise_encode(const opj_image_t *p_image, l_current_pi = l_pi; /* memory allocation for include*/ - l_current_pi->include_size = l_tcp->numlayers * l_step_l; - l_current_pi->include = (OPJ_INT16*) opj_calloc(l_current_pi->include_size, - sizeof(OPJ_INT16)); + l_current_pi->include = NULL; + if (l_step_l <= UINT_MAX / l_tcp->numlayers) { + l_current_pi->include_size = l_tcp->numlayers * l_step_l; + l_current_pi->include = (OPJ_INT16*) opj_calloc(l_current_pi->include_size, + sizeof(OPJ_INT16)); + } if (!l_current_pi->include) { opj_free(l_tmp_data); opj_free(l_tmp_ptr); From 4a53030004b45342973e106c64ceedb3821a08fe Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sun, 5 Apr 2026 13:29:19 +0200 Subject: [PATCH 2/2] CI updates --- .github/workflows/build.yml | 2 +- ...=> knownfailures-macOS14.8-xcode15.4-arm64-Release-3rdP.txt} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename tools/travis-ci/{knownfailures-macOS14.7-xcode15.4-arm64-Release-3rdP.txt => knownfailures-macOS14.8-xcode15.4-arm64-Release-3rdP.txt} (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9faa411fa..e2f27f123 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -104,7 +104,7 @@ jobs: OPJ_NONCOMMERCIAL: 1 macos_x86_64: - runs-on: macos-13 + runs-on: macos-15-intel if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')" steps: - name: Checkout diff --git a/tools/travis-ci/knownfailures-macOS14.7-xcode15.4-arm64-Release-3rdP.txt b/tools/travis-ci/knownfailures-macOS14.8-xcode15.4-arm64-Release-3rdP.txt similarity index 100% rename from tools/travis-ci/knownfailures-macOS14.7-xcode15.4-arm64-Release-3rdP.txt rename to tools/travis-ci/knownfailures-macOS14.8-xcode15.4-arm64-Release-3rdP.txt