diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2020-10-28 13:51:17 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2020-10-28 13:51:17 +0300 |
| commit | 6beb080a01aab389e5b886218f6dbdd468e337b7 (patch) | |
| tree | 7248f9fb96c90344b6774589089a9a346395d910 /Zend/zend_compile.c | |
| parent | d928c5828186a31c76b1553da2d07800d6761072 (diff) | |
| parent | 68f80be9d1380de731930187250a7ed6b55ae196 (diff) | |
| download | php-git-6beb080a01aab389e5b886218f6dbdd468e337b7.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fixed run-time binding of preloaded dynamically declared function
Diffstat (limited to 'Zend/zend_compile.c')
| -rw-r--r-- | Zend/zend_compile.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index d5318f30a5..60b0948a47 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1082,7 +1082,11 @@ ZEND_API zend_result do_bind_function(zval *lcname) /* {{{ */ return FAILURE; } function = (zend_function*)Z_PTR_P(zv); - zv = zend_hash_set_bucket_key(EG(function_table), (Bucket*)zv, Z_STR_P(lcname)); + if (UNEXPECTED(function->common.fn_flags & ZEND_ACC_PRELOADED)) { + zv = zend_hash_add(EG(function_table), Z_STR_P(lcname), zv); + } else { + zv = zend_hash_set_bucket_key(EG(function_table), (Bucket*)zv, Z_STR_P(lcname)); + } if (UNEXPECTED(!zv)) { do_bind_function_error(Z_STR_P(lcname), &function->op_array, 0); return FAILURE; |