felipe Tue Feb 12 01:31:12 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard array.c
Log:
array_slice() - Fixed behavior when NULL is given in third parameter (BC)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.37.2.21&r2=1.308.2.21.2.37.2.22&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.37.2.21
php-src/ext/standard/array.c:1.308.2.21.2.37.2.22
--- php-src/ext/standard/array.c:1.308.2.21.2.37.2.21 Mon Feb 11 13:34:41 2008
+++ php-src/ext/standard/array.c Tue Feb 12 01:31:12 2008
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.308.2.21.2.37.2.21 2008/02/11 13:34:41 tony2001 Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.37.2.22 2008/02/12 01:31:12 felipe Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2107,9 +2107,10 @@
PHP_FUNCTION(array_slice)
{
zval *input, /* Input array */
+ **z_length, /* How many elements to get */
**entry; /* An array entry */
long offset, /* Offset to get elements from */
- length = 0; /* How many elements to get */
+ length = 0;
zend_bool preserve_keys = 0; /* Whether to preserve keys while copying
to the new array or not */
int num_in, /* Number of elements in the
input array */
pos; /* Current position in the
array */
@@ -2118,7 +2119,7 @@
ulong num_key;
HashPosition hpos;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "al|lb", &input,
&offset, &length, &preserve_keys) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "al|Zb", &input,
&offset, &z_length, &preserve_keys) == FAILURE) {
return;
}
@@ -2126,8 +2127,11 @@
num_in = zend_hash_num_elements(Z_ARRVAL_P(input));
/* We want all entries from offset to the end if length is not passed
or is null */
- if (length == 0) {
+ if (ZEND_NUM_ARGS() < 3 || Z_TYPE_PP(z_length) == IS_NULL) {
length = num_in;
+ } else {
+ convert_to_long_ex(z_length);
+ length = Z_LVAL_PP(z_length);
}
/* Initialize returned array */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
