projects
/
openjpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e078172
)
Cast to size_t before multiplication
author
Matthieu Darbois
<mayeut@users.noreply.github.com>
Thu, 8 Sep 2016 05:34:46 +0000
(07:34 +0200)
committer
GitHub
<noreply@github.com>
Thu, 8 Sep 2016 05:34:46 +0000
(07:34 +0200)
Need to cast to size_t before multiplication otherwise overflow check is useless.
src/lib/openjp2/pi.c
patch
|
blob
|
history
diff --git
a/src/lib/openjp2/pi.c
b/src/lib/openjp2/pi.c
index 36e2ff0cfcda001bbef53e097517ca417386f321..809b33d731dca0b4df4868949d29a5a474cc2a3a 100644
(file)
--- 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