diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-02-25 14:14:56 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-02-25 14:14:56 +0000 |
| commit | 7dd65e84e61db4e5c4d36fa16a5da49e176acf64 (patch) | |
| tree | 768f5440a1a61e64362334fb76f76d743a2d815a /src/lib | |
| parent | e260ec6e9d85a81d950956227c343a1c38815b42 (diff) | |
[trunk] Revert r2415 for now since it introduce large regression
Diffstat (limited to 'src/lib')
| -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 17d5b22c..0982d6b5 100644 --- a/src/lib/openjp2/t2.c +++ b/src/lib/openjp2/t2.c @@ -983,11 +983,6 @@ OPJ_BOOL opj_t2_read_packet_header( opj_t2_t* p_t2, do { l_cblk->segs[l_segno].numnewpasses = opj_int_min(l_cblk->segs[l_segno].maxpasses - l_cblk->segs[l_segno].numpasses, n); l_cblk->segs[l_segno].newlen = opj_bio_read(l_bio, l_cblk->numlenbits + opj_uint_floorlog2(l_cblk->segs[l_segno].numnewpasses)); - /* 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; - } n -= l_cblk->segs[l_segno].numnewpasses; if (n > 0) { @@ -1125,7 +1120,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; |