summaryrefslogtreecommitdiff
path: root/Zend/zend_execute_API.c
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-05-23 10:41:27 +0200
committerNikita Popov <nikita.ppv@gmail.com>2019-05-23 10:41:27 +0200
commitc3ee12e7868dbc08da36e780eee80a9d3c2e30d1 (patch)
tree5b3b13a66aa54acab89246a8ae3908c021eb0cf7 /Zend/zend_execute_API.c
parentb63cb6742123e9fe125cd4bc6c7ac0bdddf0f3b2 (diff)
parent64918c770282c0f60b407e8de3201a6b68c88e78 (diff)
downloadphp-git-c3ee12e7868dbc08da36e780eee80a9d3c2e30d1.tar.gz
Merge branch 'PHP-7.4'
Diffstat (limited to 'Zend/zend_execute_API.c')
-rw-r--r--Zend/zend_execute_API.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 5e8e2f467c..eea297fb56 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -861,7 +861,11 @@ ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, zend_string *
if (!key) {
zend_string_release_ex(lc_name, 0);
}
- return (zend_class_entry*)Z_PTR_P(zv);
+ ce = (zend_class_entry*)Z_PTR_P(zv);
+ if (UNEXPECTED(!(ce->ce_flags & ZEND_ACC_LINKED))) {
+ return NULL;
+ }
+ return ce;
}
/* The compiler is not-reentrant. Make sure we __autoload() only during run-time