From 2cbad4f07438302c746886226e9ce884f9996e93 Mon Sep 17 00:00:00 2001 From: trylab Date: Thu, 8 Sep 2016 10:41:34 +0800 Subject: [PATCH] Strengthen integer overflow check in opj_pi_create_decode l_tcp->numlayers and l_step_l are both OPJ_UINT32 type variables. Thus using SIZE_MAX or ((size_t)-1) to check integer overflow is insufficient. We should use (OPJ_UINT32)-1 here. --- src/lib/openjp2/pi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c index 36e2ff0c..70e6ed16 100644 --- a/src/lib/openjp2/pi.c +++ b/src/lib/openjp2/pi.c @@ -1239,7 +1239,7 @@ opj_pi_iterator_t *opj_pi_create_decode(opj_image_t *p_image, /* memory allocation for include */ /* prevent an integer overflow issue */ l_current_pi->include = 00; - if (l_step_l <= (SIZE_MAX / (l_tcp->numlayers + 1U))) + if (l_step_l <= (((OPJ_UINT32)-1) / (l_tcp->numlayers + 1U))) { l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16)); }