From 251e3a649d9608c349b83a4d3e4000d0a88e1138 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Tue, 29 Jan 2008 00:39:26 +0000 Subject: [PATCH] fix #43596 (array_slice(): $length arg ignored when it is 0) --- ext/standard/array.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ext/standard/array.c b/ext/standard/array.c index 303bf582a7..390012c107 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -2296,24 +2296,28 @@ PHP_FUNCTION(array_slice) zval *input, /* Input array */ **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 */ + zval *z_length; /* How many elements to get */ zstr string_key; uint string_key_len; 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|z/b", &input, &offset, &z_length, &preserve_keys) == FAILURE) { return; } /* Get number of entries in the input hash */ 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 length is 0 */ - if (length == 0) { + /* We want all entries from offset to the end if length is not passed or length 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 { length = num_in; } -- 2.50.1