From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 27 Jul 2017 20:29:17 +0000 (+0200)
Subject: Avoid undefined shift behaviour if bit depth == 32 (#895)
X-Git-Tag: v2.2.0~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e03e9474667e5117341351699f0b1dbb06f93346;p=openjpeg

Avoid undefined shift behaviour if bit depth == 32 (#895)

Fixes openjeg-crashes-2017-07-27/id:000000,sig:11,src:003798,op:ext_AO,pos:128.jp2
---

diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
index 9ed8c044..5f1c5575 100644
--- a/src/lib/openjp2/j2k.c
+++ b/src/lib/openjp2/j2k.c
@@ -2234,9 +2234,9 @@ static OPJ_BOOL opj_j2k_read_siz(opj_j2k_t *p_j2k,
         /* Avoids later undefined shift in computation of */
         /* p_j2k->m_specific_param.m_decoder.m_default_tcp->tccps[i].m_dc_level_shift = 1
                     << (l_image->comps[i].prec - 1); */
-        if (l_img_comp->prec > 32) {
+        if (l_img_comp->prec > 31) {
             opj_event_msg(p_manager, EVT_ERROR,
-                          "Invalid values for comp = %d : prec=%u (should be between 1 and 38 according to the JPEG2000 norm. OpenJpeg only supports up to 32)\n",
+                          "Invalid values for comp = %d : prec=%u (should be between 1 and 38 according to the JPEG2000 norm. OpenJpeg only supports up to 31)\n",
                           i, l_img_comp->prec);
             return OPJ_FALSE;
         }
@@ -6271,9 +6271,9 @@ static OPJ_BOOL opj_j2k_read_cbd(opj_j2k_t *p_j2k,
         l_comp->sgnd = (l_comp_def >> 7) & 1;
         l_comp->prec = (l_comp_def & 0x7f) + 1;
 
-        if (l_comp->prec > 32) {
+        if (l_comp->prec > 31) {
             opj_event_msg(p_manager, EVT_ERROR,
-                          "Invalid values for comp = %d : prec=%u (should be between 1 and 38 according to the JPEG2000 norm. OpenJpeg only supports up to 32)\n",
+                          "Invalid values for comp = %d : prec=%u (should be between 1 and 38 according to the JPEG2000 norm. OpenJpeg only supports up to 31)\n",
                           i, l_comp->prec);
             return OPJ_FALSE;
         }