- Revert r309308 temporarily to get 5.3.6 out

diff --git a/NEWS b/NEWS
index 543e3ab358234e793c73bc5da078a26291ab5075..0d851b8b63a4b9fe8fb951012a2568056950c8f0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,8 +4,6 @@
 - Zend Engine:
   . Fixed bug numerous crashes due to setlocale (crash on error, pcre, mysql
     etc.) on Windows in thread safe mode. (Pierre)
-  . Fixed bug #54265 (crash when variable gets reassigned in error handler).
-    (Dmitry)
   . Fixed bug #54262 (Crash when assigning value to a dimension in a non-array).
     (Dmitry)
 

diff --git a/Zend/tests/bug54265.phpt b/Zend/tests/bug54265.phpt
deleted file mode 100644 (file)
index 43db028..0000000
--- a/Zend/tests/bug54265.phpt
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-Bug #54265 (crash when variable gets reassigned in error handler)
---FILE--
-<?php
-function my_errorhandler($errno,$errormsg) {
-  global $my_var;
-  $my_var = 0;
-  echo "EROOR: $errormsg\n";
-}
-set_error_handler("my_errorhandler");
-$my_var = str_repeat("A",$my_var[0]->errormsg = "xyz");
-echo "ok\n";
-?>
---EXPECT--
-EROOR: Creating default object from empty value
-ok
-

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index f10fce38dc2678763907804b3eb960b0218f07c4..e270816d8b0ab2c0b33bbc62c086b8a7095a1eca 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -536,22 +536,10 @@ static inline void zend_assign_to_object(znode *result, zval **object_ptr, zval
                    (Z_TYPE_P(object) == IS_BOOL && Z_LVAL_P(object) == 0) ||
                    (Z_TYPE_P(object) == IS_STRING && Z_STRLEN_P(object) == 0)) {
                        SEPARATE_ZVAL_IF_NOT_REF(object_ptr);
+                       zval_dtor(*object_ptr);
+                       object_init(*object_ptr);
                        object = *object_ptr;
-                       Z_ADDREF_P(object);
                        zend_error(E_STRICT, "Creating default object from empty value");
-                       if (Z_REFCOUNT_P(object) == 1) {
-                               /* object was removed by error handler, nothing to assign to */
-                               zval_ptr_dtor(&object);
-                               if (retval) {
-                                       *retval = &EG(uninitialized_zval);
-                                       PZVAL_LOCK(*retval);
-                               }
-                               FREE_OP(free_value);
-                               return;
-                       }
-                       Z_DELREF_P(object);
-                       zval_dtor(object);
-                       object_init(object);
                } else {
                        zend_error(E_WARNING, "Attempt to assign property of non-object");
                        if (!RETURN_VALUE_UNUSED(result)) {