fixed part of issue 69, when tile-part index is inconsistent with the total number...

diff --git a/CHANGES b/CHANGES
index d21c98184325722e5762350c486f717ce90320b6..a484fcb86b111da1419388b1ed0e3d040882bc21 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+May 16, 2011
+* [antonin] fixed part of issue 69, when tile-part index is inconsistent with the total number of tile-parts
+
 May 12, 2011
 * [antonin] xcode project file updated (now integrates openjpip)
 

diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index de1c2067dd4745d147510222b7d120e14b2e3def..8ccc14f6f4a8f583eb85a001cb781bc81e67c444 100644 (file)
--- a/libopenjpeg/j2k.c
+++ b/libopenjpeg/j2k.c
@@ -1280,6 +1280,11 @@ static void j2k_read_sot(opj_j2k_t *j2k) {
        
        partno = cio_read(cio, 1);
        numparts = cio_read(cio, 1);
+  
+  if (partno >= numparts) {
+    opj_event_msg(j2k->cinfo, EVT_WARNING, "SOT marker inconsistency in tile %d: tile-part index greater than number of tile-parts\n", tileno);
+    numparts = partno+1;
+  }
        
        j2k->curtileno = tileno;
        j2k->cur_tp_num = partno;
@@ -1295,15 +1300,14 @@ static void j2k_read_sot(opj_j2k_t *j2k) {
                        j2k->cstr_info->tile[tileno].tileno = tileno;
                        j2k->cstr_info->tile[tileno].start_pos = cio_tell(cio) - 12;
                        j2k->cstr_info->tile[tileno].end_pos = j2k->cstr_info->tile[tileno].start_pos + totlen - 1;                             
-                       j2k->cstr_info->tile[tileno].num_tps = numparts;
-                       if (numparts)
-                               j2k->cstr_info->tile[tileno].tp = (opj_tp_info_t *) opj_malloc(numparts * sizeof(opj_tp_info_t));
-                       else
-                               j2k->cstr_info->tile[tileno].tp = (opj_tp_info_t *) opj_malloc(10 * sizeof(opj_tp_info_t)); // Fixme (10)
-               }
-               else {
+    } else {
                        j2k->cstr_info->tile[tileno].end_pos += totlen;
-               }               
+               }
+    j2k->cstr_info->tile[tileno].num_tps = numparts;
+    if (numparts)
+      j2k->cstr_info->tile[tileno].tp = (opj_tp_info_t *) opj_realloc(j2k->cstr_info->tile[tileno].tp, numparts * sizeof(opj_tp_info_t));
+    else
+      j2k->cstr_info->tile[tileno].tp = (opj_tp_info_t *) opj_realloc(j2k->cstr_info->tile[tileno].tp, 10 * sizeof(opj_tp_info_t)); // Fixme (10)
                j2k->cstr_info->tile[tileno].tp[partno].tp_start_pos = cio_tell(cio) - 12;
                j2k->cstr_info->tile[tileno].tp[partno].tp_end_pos = 
                        j2k->cstr_info->tile[tileno].tp[partno].tp_start_pos + totlen - 1;