svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/gd/libgd/gd.c branches/PHP_5_2/ext/gd/tests/bug51671.phpt branches/PHP_5_3/NEWS
branches/PHP_5_3/ext/gd/libgd/gd.c branches/PHP_5_3/ext/gd/tests/bug51671.phpt trunk/ext/gd/libgd/gd.c trunk/ext/gd/tests/bug51671.phpt

pajoye Wed, 28 Apr 2010 08:23:44 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=298693 Log: - Fix #51671, imagefill does not work correctly for small images Bug: http://bugs.php.net/51671 (Assigned) imagefill does not work correctly for small images Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/ext/gd/libgd/gd.c A php/php-src/branches/PHP_5_2/ext/gd/tests/bug51671.phpt U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/gd/libgd/gd.c A php/php-src/branches/PHP_5_3/ext/gd/tests/bug51671.phpt U php/php-src/trunk/ext/gd/libgd/gd.c A php/php-src/trunk/ext/gd/tests/bug51671.phpt Modified: php/php-src/branches/PHP_5_2/NEWS =================================================================== --- php/php-src/branches/PHP_5_2/NEWS 2010-04-28 08:04:52 UTC (rev 298692) +++ php/php-src/branches/PHP_5_2/NEWS 2010-04-28 08:23:44 UTC (rev 298693) @@ -14,6 +14,8 @@ - Fixed handling of session variable serialization on certain prefix characters. Reported by Stefan Esser (Ilia) +- Fixed bug #51671 (imagefill does not work correctly for small images). + (Pierre) - Fixed bug #51670 (getColumnMeta causes segfault when re-executing query after calling nextRowset). (Pierrick) - Fixed bug #51629 (CURLOPT_FOLLOWLOCATION error message is misleading). Modified: php/php-src/branches/PHP_5_2/ext/gd/libgd/gd.c =================================================================== --- php/php-src/branches/PHP_5_2/ext/gd/libgd/gd.c 2010-04-28 08:04:52 UTC (rev 298692) +++ php/php-src/branches/PHP_5_2/ext/gd/libgd/gd.c 2010-04-28 08:23:44 UTC (rev 298693) @@ -2000,7 +2000,7 @@ goto done; } gdImageSetPixel(im, ix, iy, nc); - } while(ix++ < (im->sx -1)); + } while(iy++ < (im->sy -1)); goto done; } Added: php/php-src/branches/PHP_5_2/ext/gd/tests/bug51671.phpt =================================================================== --- php/php-src/branches/PHP_5_2/ext/gd/tests/bug51671.phpt (rev 0) +++ php/php-src/branches/PHP_5_2/ext/gd/tests/bug51671.phpt 2010-04-28 08:23:44 UTC (rev 298693) @@ -0,0 +1,24 @@ +--TEST-- +Bug #51671 (imagefill does not work correctly for small images) +--SKIPIF-- +<?php + if(!extension_loaded('gd')){ die('skip gd extension not available'); } +?> +--FILE-- +<?php +$w = 1; +$h = 50; +$im = imagecreatetruecolor($w, $h); +$white = imagecolorallocate($im, 255, 255, 255); +imagefill($im, 0, 0, $white); + +for ($iy = 0; $iy < $h; $iy++) { + if (($c = imagecolorat($im, 0, $iy)) != $white) { + printf("Failed, (0, $iy) is %X\n", $c); + } +} + +echo "OK\n"; +?> +--EXPECTF-- +OK Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2010-04-28 08:04:52 UTC (rev 298692) +++ php/php-src/branches/PHP_5_3/NEWS 2010-04-28 08:23:44 UTC (rev 298693) @@ -28,6 +28,9 @@ - Fixed a NULL pointer dereference when processing invalid XML-RPC requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert) - Fixed 64-bit integer overflow in mhash_keygen_s2k(). (Clément LECIGNE, Stas) + +- Fixed bug #51671 (imagefill does not work correctly for small images). + (Pierre) - Fixed bug #51670 (getColumnMeta causes segfault when re-executing query after calling nextRowset). (Pierrick) - Fixed bug #51647 Certificate file without private key (pk in another file) Modified: php/php-src/branches/PHP_5_3/ext/gd/libgd/gd.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/gd/libgd/gd.c 2010-04-28 08:04:52 UTC (rev 298692) +++ php/php-src/branches/PHP_5_3/ext/gd/libgd/gd.c 2010-04-28 08:23:44 UTC (rev 298693) @@ -1907,7 +1907,7 @@ goto done; } gdImageSetPixel(im, ix, iy, nc); - } while(ix++ < (im->sx -1)); + } while(iy++ < (im->sy -1)); goto done; } Added: php/php-src/branches/PHP_5_3/ext/gd/tests/bug51671.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/gd/tests/bug51671.phpt (rev 0) +++ php/php-src/branches/PHP_5_3/ext/gd/tests/bug51671.phpt 2010-04-28 08:23:44 UTC (rev 298693) @@ -0,0 +1,24 @@ +--TEST-- +Bug #51671 (imagefill does not work correctly for small images) +--SKIPIF-- +<?php + if(!extension_loaded('gd')){ die('skip gd extension not available'); } +?> +--FILE-- +<?php +$w = 1; +$h = 50; +$im = imagecreatetruecolor($w, $h); +$white = imagecolorallocate($im, 255, 255, 255); +imagefill($im, 0, 0, $white); + +for ($iy = 0; $iy < $h; $iy++) { + if (($c = imagecolorat($im, 0, $iy)) != $white) { + printf("Failed, (0, $iy) is %X\n", $c); + } +} + +echo "OK\n"; +?> +--EXPECTF-- +OK Modified: php/php-src/trunk/ext/gd/libgd/gd.c =================================================================== --- php/php-src/trunk/ext/gd/libgd/gd.c 2010-04-28 08:04:52 UTC (rev 298692) +++ php/php-src/trunk/ext/gd/libgd/gd.c 2010-04-28 08:23:44 UTC (rev 298693) @@ -1907,7 +1907,7 @@ goto done; } gdImageSetPixel(im, ix, iy, nc); - } while(ix++ < (im->sx -1)); + } while(iy++ < (im->sy -1)); goto done; } Added: php/php-src/trunk/ext/gd/tests/bug51671.phpt =================================================================== --- php/php-src/trunk/ext/gd/tests/bug51671.phpt (rev 0) +++ php/php-src/trunk/ext/gd/tests/bug51671.phpt 2010-04-28 08:23:44 UTC (rev 298693) @@ -0,0 +1,24 @@ +--TEST-- +Bug #51671 (imagefill does not work correctly for small images) +--SKIPIF-- +<?php + if(!extension_loaded('gd')){ die('skip gd extension not available'); } +?> +--FILE-- +<?php +$w = 1; +$h = 50; +$im = imagecreatetruecolor($w, $h); +$white = imagecolorallocate($im, 255, 255, 255); +imagefill($im, 0, 0, $white); + +for ($iy = 0; $iy < $h; $iy++) { + if (($c = imagecolorat($im, 0, $iy)) != $white) { + printf("Failed, (0, $iy) is %X\n", $c); + } +} + +echo "OK\n"; +?> +--EXPECTF-- +OK