From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Wed, 26 Feb 2014 11:09:20 +0000 (+0000)
Subject: [trunk] Import patch from sumatrapdf team. This handle testcase 2539.pdf.SIGFPE.706... 
X-Git-Tag: version.2.0.1~4^2~220
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ae6ff80187bbd8d9467b500799cb752b3f921c0;p=openjpeg

[trunk] Import patch from sumatrapdf team. This handle testcase 2539.pdf.SIGFPE.706.1712
Update issue 225
---

diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
index 52cf06c5..a6397eff 100644
--- a/src/lib/openjp2/j2k.c
+++ b/src/lib/openjp2/j2k.c
@@ -1959,6 +1959,11 @@ static OPJ_BOOL opj_j2k_read_siz(opj_j2k_t *p_j2k,
                 opj_event_msg(p_manager, EVT_ERROR, "Error with SIZ marker: negative image size (%d x %d)\n", l_image->x1 - l_image->x0, l_image->y1 - l_image->y0);
                 return OPJ_FALSE;
         }
+        /* testcase 2539.pdf.SIGFPE.706.1712 (also 3622.pdf.SIGFPE.706.2916 and 4008.pdf.SIGFPE.706.3345 and maybe more) */
+        if (!(l_cp->tdx * l_cp->tdy)) {
+                opj_event_msg(p_manager, EVT_ERROR, "Error with SIZ marker: invalid tile size (tdx: %d, tdy: %d)\n", l_cp->tdx, l_cp->tdy);
+                return OPJ_FALSE;
+        }
 
 #ifdef USE_JPWL
         if (l_cp->correct) {