[trunk] Import patch from sumatrapdf team. This handle testcase 2539.pdf.SIGFPE.706...

Update issue 225

diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
index 52cf06c5959e070fdccbee26b9a65ce30f8edf67..a6397eff8de295a516585f18edcc146d09b9ce87 100644 (file)
--- 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) {