com php-src: Throw Error on dynamic call to instance method when called statically: Zend/zend_vm_def.h Zend/zend_vm_execute .h
| From: | Bob Weinand | Date: | Tue, 30 Jun 2015 05:07:17 +0000 |
| Subject: | com php-src: Throw Error on dynamic call to instance method when called statically: Zend/zend_vm_def.h Zend/zend_vm_execute .h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87642@lists.php.net to get a copy of this message | ||
Commit: ffd36e0fc8c91c415a6e10f4f06f39c2508bfe64
Author: Aaron Piotrowski <aaron@trowski.com> Mon, 29 Jun 2015 20:41:08 -0500
Committer: Bob Weinand <bobwei9@hotmail.com> Tue, 30 Jun 2015 07:07:17 +0200
Parents: dd2e6e866db17e4458a706b729288bfae857fa17
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ffd36e0fc8c91c415a6e10f4f06f39c2508bfe64
Log:
Throw Error on dynamic call to instance method when called statically
Changed paths:
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index a153d2a..7c7948e 100644
--- 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
index 64fa70d..ffe90f4 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1944,6 +1944,7 @@ 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);
@@ -2396,6 +2397,7 @@ 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);
@@ -2649,6 +2651,7 @@ 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);