From 63b288c4646d405d0edfb7657505b2acf5643514 Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Wed, 3 Nov 2004 21:11:48 +0000 Subject: [PATCH] - Fix invokeargs() with static methods --- Zend/zend_reflection_api.c | 10 +++++++++- ext/reflection/php_reflection.c | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Zend/zend_reflection_api.c b/Zend/zend_reflection_api.c index 992494cf89..8f03e8ef6a 100644 --- a/Zend/zend_reflection_api.c +++ b/Zend/zend_reflection_api.c @@ -2029,7 +2029,7 @@ ZEND_METHOD(reflection_method, invokeArgs) GET_REFLECTION_OBJECT_PTR(mptr); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "oa", &object, ¶m_array) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o!a", &object, ¶m_array) == FAILURE) { return; } @@ -2065,6 +2065,14 @@ ZEND_METHOD(reflection_method, invokeArgs) object = NULL; obj_ce = NULL; } else { + if (!object) { + efree(params); + zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, + "Trying to invoke non static method %s::%s without an object", + mptr->common.scope->name, mptr->common.function_name); + return; + } + obj_ce = Z_OBJCE_P(object); if (!instanceof_function(obj_ce, mptr->common.scope TSRMLS_CC)) { diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 992494cf89..8f03e8ef6a 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -2029,7 +2029,7 @@ ZEND_METHOD(reflection_method, invokeArgs) GET_REFLECTION_OBJECT_PTR(mptr); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "oa", &object, ¶m_array) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o!a", &object, ¶m_array) == FAILURE) { return; } @@ -2065,6 +2065,14 @@ ZEND_METHOD(reflection_method, invokeArgs) object = NULL; obj_ce = NULL; } else { + if (!object) { + efree(params); + zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, + "Trying to invoke non static method %s::%s without an object", + mptr->common.scope->name, mptr->common.function_name); + return; + } + obj_ce = Z_OBJCE_P(object); if (!instanceof_function(obj_ce, mptr->common.scope TSRMLS_CC)) { -- 2.40.0