Skip to content
Permalink
Browse files

Merge branch 'PHP-5.6' into PHP-7.0

  • Loading branch information...
cmb69 committed Sep 16, 2016
2 parents d2d77c0 + 46df064 commit c18263e0e0769faee96a5d0ee04b750c442783c6
Showing with 10 additions and 0 deletions.
  1. +2 −0 NEWS
  2. +8 −0 ext/gd/libgd/gd_webp.c
2 NEWS
@@ -22,6 +22,8 @@ PHP NEWS
(cmb)
. Fixed bug #50194 (imagettftext broken on transparent background w/o
alphablending). (cmb)
. Fixed bug #73003 (Integer Overflow in gdImageWebpCtx of gd_webp.c). (trylab,
cmb)

- Mbstring:
. Fixed bug #66797 (mb_substr only takes 32-bit signed integer). (cmb)
@@ -120,6 +120,14 @@ void gdImageWebpCtx (gdImagePtr im, gdIOCtx * outfile, int quantization)
quantization = 80;
}

if (overflow2(gdImageSX(im), 4)) {
return;
}

if (overflow2(gdImageSX(im) * 4, gdImageSY(im))) {
return;
}

argb = (uint8_t *)gdMalloc(gdImageSX(im) * 4 * gdImageSY(im));
if (!argb) {
return;

0 comments on commit c18263e

Please sign in to comment.
You can’t perform that action at this time.