[1.5] This fixes issues seen on PDF files

Fixes issue 156

diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index 0a73e9b3106f8277752801a8914fef5c6976da35..ec0c29b29d076b6d4a13e004d5d394f54bb2e6da 100644 (file)
--- a/libopenjpeg/j2k.c
+++ b/libopenjpeg/j2k.c
@@ -1602,7 +1602,7 @@ static void j2k_write_eoc(opj_j2k_t *j2k) {
 
 static void j2k_read_eoc(opj_j2k_t *j2k) {
        int i, tileno;
-       opj_bool success;
+       opj_bool success = false;
 
        /* if packets should be decoded */
        if (j2k->cp->limit_decoding != DECODE_ALL_BUT_PACKETS) {
@@ -1610,11 +1610,16 @@ static void j2k_read_eoc(opj_j2k_t *j2k) {
                tcd_malloc_decode(tcd, j2k->image, j2k->cp);
                for (i = 0; i < j2k->cp->tileno_size; i++) {
                        tcd_malloc_decode_tile(tcd, j2k->image, j2k->cp, i, j2k->cstr_info);
-                       tileno = j2k->cp->tileno[i];
-                       success = tcd_decode_tile(tcd, j2k->tile_data[tileno], j2k->tile_len[tileno], tileno, j2k->cstr_info);
-                       opj_free(j2k->tile_data[tileno]);
-                       j2k->tile_data[tileno] = NULL;
-                       tcd_free_decode_tile(tcd, i);
+                       if (j2k->cp->tileno[i] != -1)
+                       {
+                               tileno = j2k->cp->tileno[i];
+                               success = tcd_decode_tile(tcd, j2k->tile_data[tileno], j2k->tile_len[tileno], tileno, j2k->cstr_info);
+                               opj_free(j2k->tile_data[tileno]);
+                               j2k->tile_data[tileno] = NULL;
+                               tcd_free_decode_tile(tcd, i);
+                       }
+                       else
+                               success = false;
                        if (success == OPJ_FALSE) {
                                j2k->state |= J2K_STATE_ERR;
                                break;

diff --git a/libopenjpeg/tcd.c b/libopenjpeg/tcd.c
index 839ca7c3a919600918b591d7b4908d64c435717d..eb6237d74d0fe75426458986ff65ddffeb84ed9d 100644 (file)
--- a/libopenjpeg/tcd.c
+++ b/libopenjpeg/tcd.c
@@ -695,6 +695,12 @@ void tcd_malloc_decode_tile(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp,
                opj_tccp_t *tccp = &tcp->tccps[compno];
                opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
                
+               if (tccp->numresolutions <= 0)
+               {
+                       cp->tileno[tileno] = -1;
+                       return;
+               }
+
                /* border of each tile component (global) */
                tilec->x0 = int_ceildiv(tile->x0, image->comps[compno].dx);
                tilec->y0 = int_ceildiv(tile->y0, image->comps[compno].dy);