From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Tue, 4 Nov 2003 17:34:56 +0000 (+0000)
Subject: __tostring() handler should be binary-safe
X-Git-Tag: php-5.0.0b3RC1~769
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=68bab385cb0eb318bf3044b0cd68e71b527a829f;p=php

__tostring() handler should be binary-safe
---

diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 6ec5e537e7..a371ebfce8 100644
--- 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;