- Fix invokeargs() with static methods

diff --git a/Zend/zend_reflection_api.c b/Zend/zend_reflection_api.c
index 992494cf89e9a9174068182f9929ca95385f715c..8f03e8ef6a1d6edba1245b0038b334b0703827d9 100644 (file)
--- 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, &param_array) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o!a", &object, &param_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 992494cf89e9a9174068182f9929ca95385f715c..8f03e8ef6a1d6edba1245b0038b334b0703827d9 100644 (file)
--- 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, &param_array) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o!a", &object, &param_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)) {