diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2020-10-28 13:50:14 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2020-10-28 13:50:14 +0300 |
| commit | 68f80be9d1380de731930187250a7ed6b55ae196 (patch) | |
| tree | 43ed34e79580e199d16ede457329b3aaf8fa5b53 | |
| parent | 990bb34891c83d12c5129fd781893704f948f2f4 (diff) | |
| download | php-git-68f80be9d1380de731930187250a7ed6b55ae196.tar.gz | |
Fixed run-time binding of preloaded dynamically declared function
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | Zend/zend_compile.c | 6 |
2 files changed, 6 insertions, 1 deletions
@@ -25,6 +25,7 @@ PHP NEWS - Opcache: . Fixed bug #79643 (PHP with Opcache crashes when a file with specific name is included). (twosee) + . Fixed run-time binding of preloaded dynamically declared function. (Dmitry) - OpenSSL: . Fixed bug #79983 (openssl_encrypt / openssl_decrypt fail with OCB mode). diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 10ea65f89d..810e384177 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1050,7 +1050,11 @@ ZEND_API int 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; |