diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-11 13:15:03 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-11 13:16:38 +0200 |
| commit | e4fae9c0615cd92783c226de8abcea31ed732672 (patch) | |
| tree | fe947525c7c6c87661782f14e6592cf7fab74ea7 /Zend/zend_execute_API.c | |
| parent | 8f93beb06e8450126e6f78c3b650b68f390a4deb (diff) | |
| parent | 8f8fcbbd397370b407dc2552c4bd6ee4ccb0e93b (diff) | |
| download | php-git-e4fae9c0615cd92783c226de8abcea31ed732672.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 4963e7406c..4ad19d6764 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -34,6 +34,7 @@ #include "zend_vm.h" #include "zend_float.h" #include "zend_weakrefs.h" +#include "zend_inheritance.h" #ifdef HAVE_SYS_TIME_H #include <sys/time.h> #endif @@ -862,7 +863,8 @@ ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, zend_string * zend_string_release_ex(lc_name, 0); } ce = (zend_class_entry*)Z_PTR_P(zv); - if (UNEXPECTED(!(ce->ce_flags & ZEND_ACC_LINKED))) { + if (UNEXPECTED(!(ce->ce_flags & ZEND_ACC_LINKED)) && + !(flags & ZEND_FETCH_CLASS_ALLOW_UNLINKED)) { return NULL; } return ce; |