From 3eb19736a40c86a7dcc5c73f11562c19412b32f8 Mon Sep 17 00:00:00 2001 From: Jarrel Seah Date: Mon, 18 Nov 2019 08:20:43 +1100 Subject: [PATCH] Update t2.c --- src/lib/openjp2/t2.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lib/openjp2/t2.c b/src/lib/openjp2/t2.c index 8680bf33..3bb1cf8b 100644 --- a/src/lib/openjp2/t2.c +++ b/src/lib/openjp2/t2.c @@ -1349,15 +1349,15 @@ static OPJ_BOOL opj_t2_read_packet_data(opj_t2_t* p_t2, do { /* Check possible overflow (on l_current_data only, assumes input args already checked) then size */ - //if ((((OPJ_SIZE_T)l_current_data + (OPJ_SIZE_T)l_seg->newlen) < - // (OPJ_SIZE_T)l_current_data) || - // (l_current_data + l_seg->newlen > p_src_data + p_max_length)) { - // opj_event_msg(p_manager, EVT_ERROR, - // "read: segment too long (%d) with max (%d) for codeblock %d (p=%d, b=%d, r=%d, c=%d)\n", - // l_seg->newlen, p_max_length, cblkno, p_pi->precno, bandno, p_pi->resno, - // p_pi->compno); - // return OPJ_FALSE; - //} + if ((((OPJ_SIZE_T)l_current_data + (OPJ_SIZE_T)l_seg->newlen) < + (OPJ_SIZE_T)l_current_data) || + (l_current_data + l_seg->newlen > p_src_data + p_max_length)) { + opj_event_msg(p_manager, EVT_ERROR, + "read: segment too long (%d) current data (%d) p_src_data (%d) with max (%d) for codeblock %d (p=%d, b=%d, r=%d, c=%d)\n", + l_seg->newlen, l_current_data, p_src_data, p_max_length, cblkno, p_pi->precno, bandno, p_pi->resno, + p_pi->compno); + return OPJ_FALSE; + } #ifdef USE_JPWL /* we need here a j2k handle to verify if making a check to