pajoye Wed, 03 Feb 2010 18:15:16 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=294430
Log:
-merge: imagepolygon() and imagefilledpolygon() does not allow negative number
of points
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/gd/gd.c
U php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gd.c
A +
php/php-src/branches/PHP_5_3_2/ext/gd/tests/imagefilledpolygon_negative.phpt
(from
php/php-src/branches/PHP_5_3/ext/gd/tests/imagefilledpolygon_negative.phpt:r293538)
A + php/php-src/branches/PHP_5_3_2/ext/gd/tests/imagepolygon_negative.phpt
(from
php/php-src/branches/PHP_5_3/ext/gd/tests/imagepolygon_negative.phpt:r293538)
_U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
_U
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
Property changes on: php/php-src/branches/PHP_5_3_2
___________________________________________________________________
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293268,293341,293400,293502,293974
/php/php-src/trunk:284726
+
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293268,293341,293400,293502,293538,293974
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/gd/gd.c
===================================================================
--- php/php-src/branches/PHP_5_3_2/ext/gd/gd.c 2010-02-03 18:11:24 UTC (rev
294429)
+++ php/php-src/branches/PHP_5_3_2/ext/gd/gd.c 2010-02-03 18:15:16 UTC (rev
294430)
@@ -3427,7 +3427,10 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "You must have at
least 3 points in your array");
RETURN_FALSE;
}
-
+ if (npoints <= 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "You must give a
positive number of points");
+ RETURN_FALSE;
+ }
if (nelem < npoints * 2) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Trying to use %d
points in array with only %d points", npoints, nelem/2);
RETURN_FALSE;
Modified: php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gd.c
===================================================================
--- php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gd.c 2010-02-03 18:11:24 UTC
(rev 294429)
+++ php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gd.c 2010-02-03 18:15:16 UTC
(rev 294430)
@@ -2568,7 +2568,7 @@
typedef void (*image_line)(gdImagePtr im, int x1, int y1, int x2, int
y2, int color);
image_line draw_line;
- if (!n) {
+ if (n <= 0) {
return;
}
@@ -2621,7 +2621,7 @@
int ints;
int fill_color;
- if (!n) {
+ if (n <= 0) {
return;
}
Copied:
php/php-src/branches/PHP_5_3_2/ext/gd/tests/imagefilledpolygon_negative.phpt
(from rev 293538,
php/php-src/branches/PHP_5_3/ext/gd/tests/imagefilledpolygon_negative.phpt)
===================================================================
---
php/php-src/branches/PHP_5_3_2/ext/gd/tests/imagefilledpolygon_negative.phpt
(rev 0)
+++
php/php-src/branches/PHP_5_3_2/ext/gd/tests/imagefilledpolygon_negative.phpt
2010-02-03 18:15:16 UTC (rev 294430)
@@ -0,0 +1,15 @@
+--TEST--
+imagefilledpolygon() with a negative num of points
+--SKIPIF--
+<?php
+ if (!function_exists('imagefilledpolygon')) die('skip
imagefilledpolygon() not available');
+?>
+--FILE--
+<?php
+$im = imagecreate(100, 100);
+$black = imagecolorallocate($im, 0, 0, 0);
+if (imagefilledpolygon($im, array(0, 0, 0, 0, 0, 0), -1, $black)) echo "should
be false";
+imagedestroy($im);
+?>
+--EXPECTF--
+Warning: imagefilledpolygon(): You must give a positive number of points in %s
on line %d
Copied: php/php-src/branches/PHP_5_3_2/ext/gd/tests/imagepolygon_negative.phpt
(from rev 293538,
php/php-src/branches/PHP_5_3/ext/gd/tests/imagepolygon_negative.phpt)
===================================================================
--- php/php-src/branches/PHP_5_3_2/ext/gd/tests/imagepolygon_negative.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3_2/ext/gd/tests/imagepolygon_negative.phpt
2010-02-03 18:15:16 UTC (rev 294430)
@@ -0,0 +1,15 @@
+--TEST--
+imagepolygon() with a negative num of points
+--SKIPIF--
+<?php
+ if (!function_exists('imagepolygon')) die('skip imagepolygon() not
available');
+?>
+--FILE--
+<?php
+$im = imagecreate(100, 100);
+$black = imagecolorallocate($im, 0, 0, 0);
+if (imagepolygon($im, array(0, 0, 0, 0, 0, 0), -1, $black)) echo "should be
false";
+imagedestroy($im);
+?>
+--EXPECTF--
+Warning: imagepolygon(): You must give a positive number of points in %s on
line %d
Property changes on: php/php-src/branches/PHP_5_3_2/ext/tidy/tests
___________________________________________________________________
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293400,293502
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293400,293502,293538
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___________________________________________________________________
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293400,293502
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293400,293502,293538
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
