From dd1a2d6480a4584896fda2f0072a723c572f2f29 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 29 Jun 2022 11:47:58 +0200
Subject: [PATCH] opj_t1_encode_cblk(): avoid undefined behaviour on fuzzed
 input (fixes #1432)

---
 src/lib/openjp2/t1.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/lib/openjp2/t1.c b/src/lib/openjp2/t1.c
index f5fd2339..c8c1c0e1 100644
--- a/src/lib/openjp2/t1.c
+++ b/src/lib/openjp2/t1.c
@@ -2443,6 +2443,13 @@ static OPJ_FLOAT64 opj_t1_encode_cblk(opj_t1_t *t1,
             OPJ_INT32 tmp = *datap;
             if (tmp < 0) {
                 OPJ_UINT32 tmp_unsigned;
+                if (tmp == INT_MIN) {
+                    /* To avoid undefined behaviour when negating INT_MIN */
+                    /* but if we go here, it means we have supplied an input */
+                    /* with more bit depth than we we can really support. */
+                    /* Cf https://github.com/uclouvain/openjpeg/issues/1432 */
+                    tmp = INT_MIN + 1;
+                }
                 max = opj_int_max(max, -tmp);
                 tmp_unsigned = opj_to_smr(tmp);
                 memcpy(datap, &tmp_unsigned, sizeof(OPJ_INT32));