com php-src: Merge branch 'PHP-7.4': Zend/zend_API.h Zend /zend_builtin_functions.c ext/reflection/php_reflecti on.c ext/simplexml/simplexml.c
ext/spl/spl_fixedarray .c ext/standard/array.c
| From: | Nikita Popov | Date: | Tue, 14 May 2019 12:59:36 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.4': Zend/zend_API.h Zend /zend_builtin_functions.c ext/reflection/php_reflecti on.c ext/simplexml/simplexml.c ext/spl/spl_fixedarray .c ext/standard/array.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-106189@lists.php.net to get a copy of this message | ||
Commit: 20e983d9ce2101b93a405c7a4ebc5936771071c2
Author: Nikita Popov <nikita.ppv@gmail.com> Tue, 14 May 2019 14:59:36 +0200
Parents: 4d8e0d493a5b765b36a66baf71bc41f0c2a4fcf1 3f19f5112a7be3e4aa7ab1704d25de54645be373
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=20e983d9ce2101b93a405c7a4ebc5936771071c2
Log:
Merge branch 'PHP-7.4'
Changed paths:
MM Zend/zend_API.h
MM Zend/zend_builtin_functions.c
MM ext/reflection/php_reflection.c
MM ext/simplexml/simplexml.c
MM ext/spl/spl_fixedarray.c
MM ext/standard/array.c
Diff:
diff --cc ext/standard/array.c
index 5bc5f23,34f1284..2750f88
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@@ -3489,9 -3499,10 +3488,8 @@@ PHP_FUNCTION(array_slice
}
/* Clamp the offset.. */
- if (offset > num_in) {
+ if (offset > (zend_long) num_in) {
- ZVAL_EMPTY_ARRAY(return_value);
- return;
+ RETURN_EMPTY_ARRAY();
} else if (offset < 0 && (offset = (num_in + offset)) < 0) {
offset = 0;
}