com php-src: array_merge() may return argument wi th incremented reference counter: ext/opcache/Optimiz er/zend_func_info.c
| From: | Dmitry Stogov | Date: | Tue, 02 Apr 2019 21:44:31 +0000 |
| Subject: | com php-src: array_merge() may return argument wi th incremented reference counter: ext/opcache/Optimiz er/zend_func_info.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105499@lists.php.net to get a copy of this message | ||
Commit: 9ef2377d333006c0c95009f2c92910d6c904078c
Author: Dmitry Stogov <dmitry@zend.com> Wed, 3 Apr 2019 00:44:31 +0300
Parents: bb8ea4d64d3bd9fc93e5a6aef56d51fddcdd1e12
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9ef2377d333006c0c95009f2c92910d6c904078c
Log:
array_merge() may return argument with incremented reference counter
Changed paths:
M ext/opcache/Optimizer/zend_func_info.c
Diff:
diff --git a/ext/opcache/Optimizer/zend_func_info.c b/ext/opcache/Optimizer/zend_func_info.c
index 9184220..ef6e40e 100644
--- a/ext/opcache/Optimizer/zend_func_info.c
+++ b/ext/opcache/Optimizer/zend_func_info.c
@@ -812,7 +812,7 @@ static const func_info_t func_infos[] = {
F0("array_unshift", MAY_BE_NULL | MAY_BE_LONG),
F1("array_splice", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY |
MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY),
F1("array_slice", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY |
MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY),
- F1("array_merge", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY |
MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY),
+ FN("array_merge", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY |
MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY),
F1("array_merge_recursive", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY |
MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY),
F1("array_replace", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY |
MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY),
F1("array_replace_recursive", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY |
MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY),