__tostring() handler should be binary-safe

diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 6ec5e537e781a3417e4a22b2e4212f63430c36ff..a371ebfce8dbe004281857e6fdc65d337da21f3e 100644 (file)
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -872,8 +872,7 @@ int zend_std_cast_object(zval *readobj, zval *writeobj, int type, int should_fre
                        if (Z_TYPE_P(retval) != IS_STRING) {
                                zend_error(E_ERROR, "Method %s::__toString() must return a string value", Z_OBJCE_P(readobj)->name);
                        }
-                       ZVAL_STRING(writeobj, Z_STRVAL_P(retval), 1);
-                       zval_ptr_dtor(&retval);
+                       REPLACE_ZVAL_VALUE(&writeobj, retval, 0);
                        return SUCCESS;
                }
                break;