From: Matthieu Darbois <mayeut@users.noreply.github.com>
Date: Thu, 8 Sep 2016 05:34:46 +0000 (+0200)
Subject: Cast to size_t before multiplication
X-Git-Tag: v2.1.2~16
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=bf845a3892a6701a3766ea6478abc9cf560362ef;hp=b75acb3bb9e0fdf0f167f0a3331470c0a6e5ff3e;p=openjpeg.git

Cast to size_t before multiplication

Need to cast to size_t before multiplication otherwise overflow check is useless.
---

diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c
index 36e2ff0c..809b33d7 100644
--- a/src/lib/openjp2/pi.c
+++ b/src/lib/openjp2/pi.c
@@ -1241,7 +1241,7 @@ opj_pi_iterator_t *opj_pi_create_decode(opj_image_t *p_image,
 	l_current_pi->include = 00;
 	if (l_step_l <= (SIZE_MAX / (l_tcp->numlayers + 1U)))
 	{
-		l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16));
+		l_current_pi->include = (OPJ_INT16*) opj_calloc((size_t)(l_tcp->numlayers + 1U) * l_step_l, sizeof(OPJ_INT16));
 	}
 
 	if