diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-11-24 12:03:23 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-11-24 12:03:44 +0800 |
| commit | c1c91c95a6eaa40dced29813a085d47a24cc7b07 (patch) | |
| tree | 295f43deaed644c6157339b7b7602e07f07b97e3 | |
| parent | 0880f2d2f3973e94b9b48e137385862b03d20f75 (diff) | |
| parent | e19d263d81452c2117773387680e3da0716f1f34 (diff) | |
| download | php-git-c1c91c95a6eaa40dced29813a085d47a24cc7b07.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73585 (Logging of "Internal Zend error - Missing class information" missing class name)
| -rw-r--r-- | Zend/zend_compile.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 47cc6c649c..63359dfa39 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1108,10 +1108,8 @@ ZEND_API zend_class_entry *do_bind_class(const zend_op_array* op_array, const ze lcname = RT_CONSTANT(op_array, opline->op1); rtd_key = lcname + 1; } - if ((ce = zend_hash_find_ptr(class_table, Z_STR_P(rtd_key))) == NULL) { - zend_error_noreturn(E_COMPILE_ERROR, "Internal Zend error - Missing class information for %s", Z_STRVAL_P(rtd_key)); - return NULL; - } + ce = zend_hash_find_ptr(class_table, Z_STR_P(rtd_key)); + ZEND_ASSERT(ce); ce->refcount++; if (zend_hash_add_ptr(class_table, Z_STR_P(lcname), ce) == NULL) { ce->refcount--; |