From 68f80be9d1380de731930187250a7ed6b55ae196 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Wed, 28 Oct 2020 13:50:14 +0300 Subject: [PATCH] Fixed run-time binding of preloaded dynamically declared function --- NEWS | 1 + Zend/zend_compile.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index c848134c7c..64968cb7dd 100644 --- a/NEWS +++ b/NEWS @@ -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; -- 2.50.1