iliaa Tue Feb 5 15:58:28 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard array.c
Log:
Fixed bug #44046 (crash inside array_slice() function with an invalid
by-ref offset).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.37.2.19&r2=1.308.2.21.2.37.2.20&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.19
php-src/ext/standard/array.c:1.308.2.21.2.37.2.20
--- php-src/ext/standard/array.c:1.308.2.21.2.37.2.19 Tue Jan 29 10:45:06 2008
+++ php-src/ext/standard/array.c Tue Feb 5 15:58:27 2008
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.308.2.21.2.37.2.19 2008/01/29 10:45:06 dmitry Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.37.2.20 2008/02/05 15:58:27 iliaa Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2109,17 +2109,16 @@
zval *input, /* Input array */
**entry; /* An array entry */
long offset, /* Offset to get elements from */
- length = 0; /* How many elements to get */
+ length = NULL; /* How many elements to get */
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 */
- zval *z_length;
char *string_key;
uint string_key_len;
ulong num_key;
HashPosition hpos;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "al|z/b", &input,
&offset, &z_length, &preserve_keys) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "al|lb", &input,
&offset, &length, &preserve_keys) == FAILURE) {
return;
}
@@ -2127,10 +2126,7 @@
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 (ZEND_NUM_ARGS() >= 3 && Z_TYPE_P(z_length) != IS_NULL) {
- convert_to_long(z_length);
- length = Z_LVAL_P(z_length);
- } else {
+ if (length == NULL) {
length = num_in;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
