com php-src: Fix parse_method_params: Zend/zend_API .c

Commit: 4d8c59f0da439f52a31121a101eef0e5a0faf973 Author: Nikita Popov <nikic@php.net> Tue, 6 May 2014 21:56:01 +0200 Parents: ccc2c8ae165b94765b8dfe62c0a1bab7dabb1e37 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4d8c59f0da439f52a31121a101eef0e5a0faf973 Log: Fix parse_method_params Changed paths: M Zend/zend_API.c Diff: diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 8fc21f1..f944de9 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1012,7 +1012,12 @@ ZEND_API int zend_parse_method_parameters(int num_args TSRMLS_DC, zval *this_ptr zval **object; zend_class_entry *ce; - if (!this_ptr || Z_TYPE_P(this_ptr) != IS_OBJECT) { + /* Just checking this_ptr is not enough, because fcall_common_helper does not set + * Z_OBJ(EG(This)) to NULL when calling an internal function with common.scope == NULL. + * In that case EG(This) would still be the $this from the calling code and we'd take the + * wrong branch here. */ + zend_bool is_method = EG(current_execute_data)->function_state.function->common.scope != NULL; + if (!is_method || !this_ptr || Z_TYPE_P(this_ptr) != IS_OBJECT) { RETURN_IF_ZERO_ARGS(num_args, p, 0); va_start(va, type_spec);