iliaa Mon Dec 3 14:11:09 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard array.c
/php-src NEWS
Log:
Fixed bug #43482 (array_pad() does not warn on very small pad numbers).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.43&r2=1.308.2.21.2.44&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.43
php-src/ext/standard/array.c:1.308.2.21.2.44
--- php-src/ext/standard/array.c:1.308.2.21.2.43 Sun Nov 25 15:56:47 2007
+++ php-src/ext/standard/array.c Mon Dec 3 14:11:08 2007
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.308.2.21.2.43 2007/11/25 15:56:47 iliaa Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.44 2007/12/03 14:11:08 iliaa Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2655,6 +2655,11 @@
/* Do some initial calculations */
input_size = zend_hash_num_elements(Z_ARRVAL_PP(input));
pad_size_abs = abs(Z_LVAL_PP(pad_size));
+ if (pad_size_abs < 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "You may only pad
up to 1048576 elements at a time");
+ zval_dtor(return_value);
+ RETURN_FALSE;
+ }
do_pad = (input_size >= pad_size_abs) ? 0 : 1;
/* Copy the original array */
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1022&r2=1.2027.2.547.2.1023&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1022 php-src/NEWS:1.2027.2.547.2.1023
--- php-src/NEWS:1.2027.2.547.2.1022 Sun Dec 2 21:00:06 2007
+++ php-src/NEWS Mon Dec 3 14:11:09 2007
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2008, PHP 5.2.6
+- Fixed bug #43482 (array_pad() does not warn on very small pad numbers).
+ (Ilia)
- Fixed bug #43457 (Prepared statement with incorrect parms doens't
throw exception with pdo_pgsql driver). (Ilia)
- Fixed bug #43386 (array_globals not reset to 0 properly on init). (Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
