diff options
| author | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-11-04 17:34:56 +0000 |
|---|---|---|
| committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-11-04 17:34:56 +0000 |
| commit | 68bab385cb0eb318bf3044b0cd68e71b527a829f (patch) | |
| tree | f9884bf4422f6c637d22a5600c39a5bc5bd97a2c | |
| parent | aef5f793b84892ad80d7a1b552d393b21bf2d9f7 (diff) | |
| download | php-git-68bab385cb0eb318bf3044b0cd68e71b527a829f.tar.gz | |
__tostring() handler should be binary-safe
| -rw-r--r-- | Zend/zend_object_handlers.c | 3 |
1 files changed, 1 insertions, 2 deletions
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; |