Throw Error on dynamic call to instance method when called statically

php · Jun 30, 2015 · ffd36e0 · ffd36e0
1 parent dd2e6e8
commit ffd36e0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -3237,6 +3237,7 @@ ZEND_VM_C_LABEL(try_function_name):
 
 			lcname = zend_string_init(Z_STRVAL_P(function_name), cname_length, 0);
 
+			object = NULL;
 			called_scope = zend_fetch_class_by_name(lcname, NULL, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
 			if (UNEXPECTED(called_scope == NULL)) {
 				zend_string_release(lcname);

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -1944,6 +1944,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_DYNAMIC_CALL_SPEC_CONST_H
 
 			lcname = zend_string_init(Z_STRVAL_P(function_name), cname_length, 0);
 
+			object = NULL;
 			called_scope = zend_fetch_class_by_name(lcname, NULL, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
 			if (UNEXPECTED(called_scope == NULL)) {
 				zend_string_release(lcname);
@@ -2396,6 +2397,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_DYNAMIC_CALL_SPEC_CV_HAND
 
 			lcname = zend_string_init(Z_STRVAL_P(function_name), cname_length, 0);
 
+			object = NULL;
 			called_scope = zend_fetch_class_by_name(lcname, NULL, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
 			if (UNEXPECTED(called_scope == NULL)) {
 				zend_string_release(lcname);
@@ -2649,6 +2651,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_DYNAMIC_CALL_SPEC_TMPVAR_
 
 			lcname = zend_string_init(Z_STRVAL_P(function_name), cname_length, 0);
 
+			object = NULL;
 			called_scope = zend_fetch_class_by_name(lcname, NULL, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION);
 			if (UNEXPECTED(called_scope == NULL)) {
 				zend_string_release(lcname);