[trunk] Import patch from issue 218. No dataset to check, so blindly applied it.

[openjpeg.git] / src / lib / openjp2 / j2k.c

diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
index 792c1c9fb46b592b8abb2f3ef5697463819342d2..924fdd600a0e1bc591e1667a1f23ba6091ca2088 100644 (file)
--- a/src/lib/openjp2/j2k.c
+++ b/src/lib/openjp2/j2k.c
@@ -4481,14 +4481,6 @@ static OPJ_BOOL opj_j2k_read_rgn (opj_j2k_t *p_j2k,
         };
 #endif /* USE_JPWL */
 
-        /* testcase 3635.pdf.asan.77.2930 */
-        if (l_comp_room >= l_nb_comp) {
-                opj_event_msg(p_manager, EVT_ERROR,
-                        "JPWL: bad component number in RGN (%d when there are only %d)\n",
-                        l_comp_room, l_nb_comp);
-                return OPJ_FALSE;
-        }
-
         opj_read_bytes(p_header_data,(OPJ_UINT32 *) (&(l_tcp->tccps[l_comp_no].roishift)),1);   /* SPrgn */
         ++p_header_data;
 
@@ -6322,6 +6314,7 @@ void opj_j2k_setup_encoder(     opj_j2k_t *p_j2k,
 
                                 if (parameters->csty & J2K_CCP_CSTY_PRT) {
                                         OPJ_INT32 p = 0, it_res;
+                                        assert( tccp->numresolutions > 0 );
                                         for (it_res = tccp->numresolutions - 1; it_res >= 0; it_res--) {
                                                 if (p < parameters->res_spec) {