Merge pull request #1496 from rouault/fix_1480

opj_tcd_dc_level_shift_decode(): avoid increment nullptr (fixes #1480)

diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c
index 55e9a088c2a1f9e0788db86c1a5603048a0a565b..687aa61bb094fb302f1099183e11bc35d3b58879 100644 (file)
--- a/src/lib/openjp2/tcd.c
+++ b/src/lib/openjp2/tcd.c
@@ -2315,6 +2315,9 @@ static OPJ_BOOL opj_tcd_dc_level_shift_decode(opj_tcd_t *p_tcd)
             l_max = (OPJ_INT32)((1U << l_img_comp->prec) - 1);
         }
 
+        if (l_width == 0 || l_height == 0) {
+            continue;
+        }
 
         if (l_tccp->qmfbid == 1) {
             for (j = 0; j < l_height; ++j) {