diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-12-18 21:40:20 -0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-12-18 21:40:20 -0800 |
| commit | eb4ce3f1a8d3c14bf9245ef730d885be359499a8 (patch) | |
| tree | a4daa570ebd25142fc7b1497e3cf85c84e663bf0 /Zend/zend_execute_API.c | |
| parent | 3d3782c32859f1cd3433bc5f8ac69fd4d360bb65 (diff) | |
| download | php-git-eb4ce3f1a8d3c14bf9245ef730d885be359499a8.tar.gz | |
Fixed bug #71163 (Segmentation Fault: cleanup_unfinished_calls)
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index fdffed34b2..802b7c8ca3 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -937,7 +937,6 @@ ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, const zval *k zend_class_entry *ce = NULL; zval args[1]; zval local_retval; - int retval; zend_string *lc_name; zend_fcall_info fcall_info; zend_fcall_info_cache fcall_cache; @@ -1033,7 +1032,9 @@ ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, const zval *k fcall_cache.object = NULL; zend_exception_save(); - retval = zend_call_function(&fcall_info, &fcall_cache); + if ((zend_call_function(&fcall_info, &fcall_cache) == SUCCESS) && !EG(exception)) { + ce = zend_hash_find_ptr(EG(class_table), lc_name); + } zend_exception_restore(); zval_ptr_dtor(&args[0]); @@ -1043,9 +1044,6 @@ ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, const zval *k zval_ptr_dtor(&local_retval); - if (retval == SUCCESS) { - ce = zend_hash_find_ptr(EG(class_table), lc_name); - } if (!key) { zend_string_release(lc_name); } |