MFB: array_slice() - Fixed behavior when NULL is given in third parameter (BC)

diff --git a/ext/standard/array.c b/ext/standard/array.c
index abea38070213e41a71d489545f522f6d79ecff46..69a552d8b5e5dc3c5da12e115a9f7af51eb91a01 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2294,6 +2294,7 @@ PHP_FUNCTION(array_splice)
 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;
@@ -2305,7 +2306,7 @@ PHP_FUNCTION(array_slice)
        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;
        }
 
@@ -2313,8 +2314,11 @@ PHP_FUNCTION(array_slice)
        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 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 */