diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/gd/gd.c | 9 | ||||
| -rw-r--r-- | ext/gd/tests/bug55005.phpt | 21 | ||||
| -rw-r--r-- | ext/gd/tests/imagefilledpolygon_negative.phpt | 21 | ||||
| -rw-r--r-- | ext/gd/tests/imagepolygon_negative.phpt | 21 |
5 files changed, 24 insertions, 49 deletions
@@ -17,6 +17,7 @@ PHP NEWS that allow global flag to configure query() or evaluate() calls. - GD: + . Fixed bug #55005 (imagepolygon num_points requirement). (cmb) . Replaced gd resources with objects. (Mark Randall) . Removed deprecated image2wbmp(). (cmb) . Removed deprecated png2wbmp() and jpeg2wbmp(). (cmb) diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 989a78cb0b..cc74727420 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -2745,13 +2745,8 @@ static void php_imagepolygon(INTERNAL_FUNCTION_PARAMETERS, int filled) col = COL; nelem = zend_hash_num_elements(Z_ARRVAL_P(POINTS)); - if (nelem < 6) { - zend_value_error("You must have at least 3 points in your array"); - return; - } - - if (npoints <= 0) { - zend_value_error("You must give a positive number of points"); + if (npoints < 3) { + zend_value_error("Polygon must have at least 3 points"); return; } diff --git a/ext/gd/tests/bug55005.phpt b/ext/gd/tests/bug55005.phpt new file mode 100644 index 0000000000..a48d92441c --- /dev/null +++ b/ext/gd/tests/bug55005.phpt @@ -0,0 +1,21 @@ +--TEST--
+Bug #55005 (imagepolygon num_points requirement)
+--SKIPIF--
+<?php
+if (!extension_loaded('gd')) die('skip gd extension not available');
+?>
+--FILE--
+<?php
+require_once __DIR__ . '/func.inc';
+
+$g = imagecreate(300, 300);
+$bgnd = imagecolorallocate($g, 255, 255, 255);
+$fgnd = imagecolorallocate($g, 0, 0, 0);
+trycatch_dump(
+ fn () => imagefilledpolygon($g, array(100,10, 100,100, 180,100), 2, $fgnd),
+ fn () => imagepolygon($g, array(200,10, 200,100, 280,100), 2, $fgnd)
+);
+?>
+--EXPECT--
+!! [ValueError] Polygon must have at least 3 points
+!! [ValueError] Polygon must have at least 3 points
diff --git a/ext/gd/tests/imagefilledpolygon_negative.phpt b/ext/gd/tests/imagefilledpolygon_negative.phpt deleted file mode 100644 index 165fa1c13b..0000000000 --- a/ext/gd/tests/imagefilledpolygon_negative.phpt +++ /dev/null @@ -1,21 +0,0 @@ ---TEST-- -imagefilledpolygon() with a negative num of points ---SKIPIF-- -<?php - if (!function_exists('imagefilledpolygon')) die('skip imagefilledpolygon() not available'); -?> ---FILE-- -<?php -require __DIR__ . '/func.inc'; - -$im = imagecreate(100, 100); -$black = imagecolorallocate($im, 0, 0, 0); - -trycatch_dump( - fn() => imagefilledpolygon($im, array(0, 0, 0, 0, 0, 0), -1, $black) -); - -imagedestroy($im); -?> ---EXPECT-- -!! [ValueError] You must give a positive number of points diff --git a/ext/gd/tests/imagepolygon_negative.phpt b/ext/gd/tests/imagepolygon_negative.phpt deleted file mode 100644 index 96b2e7591e..0000000000 --- a/ext/gd/tests/imagepolygon_negative.phpt +++ /dev/null @@ -1,21 +0,0 @@ ---TEST-- -imagepolygon() with a negative num of points ---SKIPIF-- -<?php - if (!function_exists('imagepolygon')) die('skip imagepolygon() not available'); -?> ---FILE-- -<?php -require __DIR__ . '/func.inc'; - -$im = imagecreate(100, 100); -$black = imagecolorallocate($im, 0, 0, 0); - -trycatch_dump( - fn() => imagepolygon($im, array(0, 0, 0, 0, 0, 0), -1, $black) -); - -imagedestroy($im); -?> ---EXPECT-- -!! [ValueError] You must give a positive number of points |