[trunk] update test suite with issue 191 to 194 and update patch for 191 which should...

diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
index 05bd3452d2a38efd532ac10feca5ce9d6e0dbe91..2fda7385d1485ce9f31b7f221c9efb26ccede1c2 100644 (file)
--- a/src/lib/openjp2/j2k.c
+++ b/src/lib/openjp2/j2k.c
@@ -7883,8 +7883,8 @@ OPJ_BOOL opj_j2k_read_SPCod_SPCoc(  opj_j2k_t *p_j2k,
         ++l_tccp->numresolutions;                                                                               /* tccp->numresolutions = read() + 1 */
         if (l_tccp->numresolutions > OPJ_J2K_MAXRLVLS) {
                 opj_event_msg(p_manager, EVT_ERROR,
-                              "Invalid value for numresolutions : %d\n",
-                              l_tccp->numresolutions);
+                              "Invalid value for numresolutions : %d, max value is set in openjpeg.h at %d\n",
+                              l_tccp->numresolutions, OPJ_J2K_MAXRLVLS);
                 return OPJ_FALSE;
         }
         ++l_current_ptr;

diff --git a/tests/nonregression/test_suite.ctest.in b/tests/nonregression/test_suite.ctest.in
index 7ffa0485d14563c589820cf259bf154bd763e902..0fa89de7035fddaa241177a03777adf6d3378665 100644 (file)
--- a/tests/nonregression/test_suite.ctest.in
+++ b/tests/nonregression/test_suite.ctest.in
@@ -74,7 +74,14 @@ opj_decompress -i  @INPUT_NR_PATH@/issue104_jpxstream.jp2 -o @TEMP_PATH@/issue10
 opj_decompress -i  @INPUT_NR_PATH@/mem-b2ace68c-1381.jp2 -o @TEMP_PATH@/mem-b2ace68c-1381.jp2.pgx
 # File which produced weird output with kakadu and not supoprter by openjpeg (problem with value of TPSot)
 opj_decompress -i  @INPUT_NR_PATH@/mem-b2b86b74-2753.jp2 -o @TEMP_PATH@/mem-b2b86b74-2753.jp2.pgx
-
+# issue 191 raised by the gdal fuzzer test (should properly failed)
+!opj_decompress -i  @INPUT_NR_PATH@/gdal_fuzzer_unchecked_numresolutions.jp2 -o @TEMP_PATH@/gdal_fuzzer_unchecked_numresolutions.pgx
+# issue 192 raised by the gdal fuzzer test (should properly failed)
+opj_decompress -i  @INPUT_NR_PATH@/gdal_fuzzer_assert_in_opj_j2k_read_SQcd_SQcc.patch.jp2 -o @TEMP_PATH@/gdal_fuzzer_assert_in_opj_j2k_read_SQcd_SQcc.patch.pgx
+# issue 193 raised by the gdal fuzzer test (should properly failed)
+opj_decompress -i  @INPUT_NR_PATH@/gdal_fuzzer_check_number_of_tiles.jp2 -o @TEMP_PATH@/gdal_fuzzer_check_number_of_tiles.pgx
+# issue 194 raised by the gdal fuzzer test (should properly failed)
+opj_decompress -i  @INPUT_NR_PATH@/gdal_fuzzer_check_comp_dx_dy.jp2 -o @TEMP_PATH@/gdal_fuzzer_check_comp_dx_dy.pgx
 
 # decode with specific area
 # prec=12; nb_c=1