From fbc6fa8194cb40ec250c0c623053670e15c31a21 Mon Sep 17 00:00:00 2001 From: openhands Date: Thu, 5 Mar 2026 22:29:47 +0800 Subject: [PATCH 1/2] Handle NULL buffer when discarding rows (cherry picked from commit 922c23a775b64501fda80f664af9f4988aa18d04) --- graf2d/asimage/src/libAfterImage/libjpeg/jquant1.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/graf2d/asimage/src/libAfterImage/libjpeg/jquant1.c b/graf2d/asimage/src/libAfterImage/libjpeg/jquant1.c index b2f96aa15d25d..d6abaf7beeb26 100644 --- a/graf2d/asimage/src/libAfterImage/libjpeg/jquant1.c +++ b/graf2d/asimage/src/libAfterImage/libjpeg/jquant1.c @@ -528,6 +528,10 @@ quantize_ord_dither (j_decompress_ptr cinfo, JSAMPARRAY input_buf, JDIMENSION col; JDIMENSION width = cinfo->output_width; + if (output_buf == NULL && num_rows) { + ERREXIT(cinfo, JERR_BAD_PARAM); + } + for (row = 0; row < num_rows; row++) { /* Initialize output values to 0 so can process components separately */ jzero_far((void FAR *) output_buf[row], From 5efd369eecd19f1218765fbd440219160677aa64 Mon Sep 17 00:00:00 2001 From: Danilo Piparo Date: Wed, 18 Mar 2026 15:09:38 +0100 Subject: [PATCH 2/2] [ci] Remove mac14 support --- .github/workflows/root-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index e7ab8750bca49..596dbdca497a1 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -96,9 +96,6 @@ jobs: # Common configs: {Release,Debug,RelWithDebInfo) # Build options: https://root.cern/install/build_from_source/#all-build-options include: - - platform: mac14 - arch: X64 - overrides: ["LLVM_ENABLE_ASSERTIONS=On", "CMAKE_CXX_STANDARD=20"] - platform: mac15 arch: ARM64 overrides: ["LLVM_ENABLE_ASSERTIONS=On", "CMAKE_CXX_STANDARD=20"]