summaryrefslogtreecommitdiff
path: root/Zend/zend_execute.c
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-02-20 12:12:27 +0100
committerNikita Popov <nikita.ppv@gmail.com>2019-02-20 12:12:27 +0100
commitdae056420d091c07e54b05fa6c22c0b59c2848f0 (patch)
tree7fce3a07a20eddb314f21f9b17e753fc6a3c7fc8 /Zend/zend_execute.c
parentc8e2b333cbcb1cfeda276fbdbb7ae3555af3ae79 (diff)
parent4f2b46dbaf4b81eb5f9511336c00df0b493f0128 (diff)
downloadphp-git-dae056420d091c07e54b05fa6c22c0b59c2848f0.tar.gz
Merge branch 'PHP-7.4'
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 899015f470..7202fef091 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 {