diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-03-18 15:19:29 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-03-18 15:19:29 +0000 |
| commit | f4707da97aee215a2328ad48114155bd2f13e414 (patch) | |
| tree | 073fa1455504d4ea7e816fc50c9f65ee9d26c73a /src | |
| parent | 51ab074d50995d1be19a6662392919de8a9d6061 (diff) | |
[trunk] Revert r2764. It breaks ~230 tests as seen on continuous. Since no dataset is available, the issue 296 will be left open.
Update issue 296
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/openjp2/t2.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/lib/openjp2/t2.c b/src/lib/openjp2/t2.c index f78d348e..253d14f8 100644 --- a/src/lib/openjp2/t2.c +++ b/src/lib/openjp2/t2.c @@ -985,11 +985,6 @@ OPJ_BOOL opj_t2_read_packet_header( opj_t2_t* p_t2, l_cblk->numnewpasses = opj_t2_getnumpasses(l_bio); l_increment = opj_t2_getcommacode(l_bio); - /* testcase 1802.pdf.SIGSEGV.36e.894 */ - if (l_cblk->segs[l_segno].newlen > *l_modified_length_ptr) { - opj_bio_destroy(l_bio); - return OPJ_FALSE; - } /* length indicator increment */ l_cblk->numlenbits += l_increment; l_segno = 0; @@ -1158,7 +1153,6 @@ OPJ_BOOL opj_t2_read_packet_data( opj_t2_t* p_t2, OPJ_BYTE* new_cblk_data = (OPJ_BYTE*) opj_realloc(l_cblk->data, l_cblk->data_current_size + l_seg->newlen); if(! new_cblk_data) { opj_free(l_cblk->data); - l_cblk->data = NULL; l_cblk->data_max_size = 0; /* opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to realloc code block cata!\n"); */ return OPJ_FALSE; |