com php-src: Fix Bug #68713 infinite loop / infinite free: ext/gd/libgd/gd.c

From: Date: Sat, 03 Jan 2015 07:34:27 +0000
Subject: com php-src: Fix Bug #68713 infinite loop / infinite free: ext/gd/libgd/gd.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83951@lists.php.net to get a copy of this message
Commit: df4aaa81ef5a65056e09958a5ab62fa8d296bfc1 Author: Remi Collet <remi@php.net> Sat, 3 Jan 2015 08:34:27 +0100 Parents: c3b44b1175c880c118132b5d12cbff9f2aaa4f65 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=df4aaa81ef5a65056e09958a5ab62fa8d296bfc1 Log: Fix Bug #68713 infinite loop / infinite free PHP not affected (emalloc never return NULL) Just to reduce diff with upstream and for legibility Apply: https://bitbucket.org/libgd/gd-libgd/commits/3c0d2203b2672b688d4d2326ff3a60b019879062 https://bitbucket..org/libgd/gd-libgd/commits/4af76c97a478d4e7c4b64e08ac67abbca7cbd0fb Bugs: https://bugs.php.net/68713 Changed paths: M ext/gd/libgd/gd.c Diff: diff --git a/ext/gd/libgd/gd.c b/ext/gd/libgd/gd.c index 59fcd35..1030303 100644 --- a/ext/gd/libgd/gd.c +++ b/ext/gd/libgd/gd.c @@ -3049,8 +3049,8 @@ int gdImagePaletteToTrueColor(gdImagePtr src) } } - /* free old palette buffer */ - for (yy = y - 1; yy >= yy - 1; yy--) { + /* free old palette buffer (y is sy) */ + for (yy = 0; yy < y; yy++) { gdFree(src->pixels[yy]); } gdFree(src->pixels); @@ -3067,13 +3067,11 @@ int gdImagePaletteToTrueColor(gdImagePtr src) return 1; clean_on_error: - if (y > 0) { - - for (yy = y; yy >= yy - 1; y--) { - gdFree(src->tpixels[y]); - } - gdFree(src->tpixels); + /* free new true color buffer (y is not allocated, have failed) */ + for (yy = 0; yy < y; yy++) { + gdFree(src->tpixels[yy]); } + gdFree(src->tpixels); return 0; }

« previous php.cvs (#83951) next »