From: trylab <trylab@users.noreply.github.com>
Date: Tue, 6 Sep 2016 05:55:49 +0000 (+0800)
Subject: Fix an integer overflow issue (#809)
X-Git-Tag: v2.1.2~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5196bda0b99b5daca18a2c12a83dea047e062fc4;p=openjpeg

Fix an integer overflow issue (#809)

Prevent an integer overflow issue in function opj_pi_create_decode of
pi.c.
---

diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c
index cffad668..36e2ff0c 100644
--- a/src/lib/openjp2/pi.c
+++ b/src/lib/openjp2/pi.c
@@ -1237,7 +1237,13 @@ opj_pi_iterator_t *opj_pi_create_decode(opj_image_t *p_image,
 	l_current_pi = l_pi;
 
 	/* memory allocation for include */
-	l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16));
+	/* prevent an integer overflow issue */
+	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));
+	}
+
 	if
 		(!l_current_pi->include)
 	{