Fixed bug #34358 (Fatal error: Cannot re-assign $this)

diff --git a/NEWS b/NEWS
index 4e2e5f2c590a808383c781ea26bdebdab53c87af..db218c490b4344759899fb2e53f91a30f0f79400 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -58,6 +58,7 @@ PHP                                                                        NEWS
 - Fixed bug #34450 (Segfault when calling mysqli_close() in destructor). (Tony)
 - Fixed bug #34449 (ext/soap: XSD_ANYXML functionality not exposed). (Dmitry)
 - Fixed bug #34420 (Possible crash inside curl_multi_remove_handle()). (Ilia)
+- Fixed bug #34358 (Fatal error: Cannot re-assign $this). (Dmitry)
 - Fixed bug #34331 (php crashes when variables_order is empty). (Ilia)
 - Fixed bug #34321 (Possible crash in filter code). (Ilia)
 - Fixed bug #34311 (unserialize() crashes with chars above 191 dec). (Nuno)

diff --git a/Zend/tests/bug34358.phpt b/Zend/tests/bug34358.phpt
new file mode 100755 (executable)
index 0000000..b9c6565
--- /dev/null
+++ b/Zend/tests/bug34358.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Bug #34358 (Fatal error: Cannot re-assign $this(again))
+--FILE--
+<?php
+class foo {
+  function bar() {
+    $ref = &$this;
+  }
+}
+$x = new foo();
+$x->bar();
+echo "ok\n";
+?>
+--EXPECT--
+ok

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index a89fb34e7448a888e56050f494bd802136b70412..4ea2d7c4bc3ea1f5e5d9f7c96a12236aba8813c0 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -567,7 +567,8 @@ void zend_do_assign(znode *result, znode *variable, znode *value TSRMLS_DC)
                        *result = last_op->result;
                        return;
                } else {
-                       if (opline_is_fetch_this(last_op TSRMLS_CC)) {
+                       if (variable->op_type == IS_VAR &&
+                           opline_is_fetch_this(last_op TSRMLS_CC)) {
                                zend_error(E_COMPILE_ERROR, "Cannot re-assign $this");
                        }
                }
@@ -597,7 +598,8 @@ void zend_do_assign_ref(znode *result, znode *lvar, znode *rvar TSRMLS_DC)
        if (last_op_number > 0) {
                zend_op *last_op = &CG(active_op_array)->opcodes[last_op_number-1];
 
-               if (opline_is_fetch_this(last_op TSRMLS_CC)) {
+               if (lvar->op_type == IS_VAR &&
+                   opline_is_fetch_this(last_op TSRMLS_CC)) {
                        zend_error(E_COMPILE_ERROR, "Cannot re-assign $this");
                }
        }