summaryrefslogtreecommitdiff
path: root/Zend/zend_execute.c
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-02-20 11:53:31 +0100
committerNikita Popov <nikita.ppv@gmail.com>2019-02-20 11:54:22 +0100
commita92db42568d5be412fd536cc96475f0a61666223 (patch)
tree5b5823579c91e77733c6b2eb39c5acb3d1c3a14d /Zend/zend_execute.c
parentc0e15a3b7fef5b341eb96e0e888f180ba7a39570 (diff)
downloadphp-git-a92db42568d5be412fd536cc96475f0a61666223.tar.gz
Use "modify" error message for FUNC_ARG fetch as well
Avoid differences based on whether a W or FUNC_ARG fetch is performed.
Diffstat (limited to 'Zend/zend_execute.c')
-rw-r--r--Zend/zend_execute.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 7d2e4426c5..70669e5fd1 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -711,6 +711,7 @@ static zend_never_inline ZEND_COLD zval* ZEND_FASTCALL make_real_object(zval *ob
zend_error(E_WARNING, "Attempt to increment/decrement property '%s' of non-object", ZSTR_VAL(property_name));
} else if (opline->opcode == ZEND_FETCH_OBJ_W
|| opline->opcode == ZEND_FETCH_OBJ_RW
+ || opline->opcode == ZEND_FETCH_OBJ_FUNC_ARG
|| opline->opcode == ZEND_ASSIGN_OBJ_REF) {
zend_error(E_WARNING, "Attempt to modify property '%s' of non-object", ZSTR_VAL(property_name));
} else {