[trunk] rework code from r2463. Really there has been some code duplication from...

Thanks to John Rogers (oracle.com) for report

diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c
index 51ddab01af97fb1863a6edc69a72791452ad32cc..32ddd4f4cd1b95d9040bb379f40c943c8a703144 100644 (file)
--- a/src/lib/openjp2/jp2.c
+++ b/src/lib/openjp2/jp2.c
@@ -1053,11 +1053,6 @@ OPJ_BOOL opj_jp2_read_cmap(      opj_jp2_t * jp2,
                return OPJ_FALSE;
        }
 
-       if (p_cmap_header_size < (OPJ_UINT32)nr_channels * 4) {
-               opj_event_msg(p_manager, EVT_ERROR, "Insufficient data for CMAP box.\n");
-               return OPJ_FALSE;
-       }
-
        cmap = (opj_jp2_cmap_comp_t*) opj_malloc(nr_channels * sizeof(opj_jp2_cmap_comp_t));
     if (!cmap)
         return OPJ_FALSE;
@@ -1155,11 +1150,6 @@ OPJ_BOOL opj_jp2_read_cdef(      opj_jp2_t * jp2,
                return OPJ_FALSE;
        }
 
-       if (p_cdef_header_size < 2) {
-               opj_event_msg(p_manager, EVT_ERROR, "Insufficient data for CDEF box.\n");
-               return OPJ_FALSE;
-       }
-
        opj_read_bytes(p_cdef_header_data,&l_value ,2);                 /* N */
        p_cdef_header_data+= 2;
 
@@ -1173,11 +1163,6 @@ OPJ_BOOL opj_jp2_read_cdef(      opj_jp2_t * jp2,
                return OPJ_FALSE;
        }
 
-       if (p_cdef_header_size < 2 + (OPJ_UINT32)(OPJ_UINT16)l_value * 6) {
-               opj_event_msg(p_manager, EVT_ERROR, "Insufficient data for CDEF box.\n");
-               return OPJ_FALSE;
-       }
-
        cdef_info = (opj_jp2_cdef_info_t*) opj_malloc(l_value * sizeof(opj_jp2_cdef_info_t));
     if (!cdef_info)
         return OPJ_FALSE;