From: Antony Dovgal <tony2001@php.net>
Date: Wed, 27 Dec 2006 16:50:05 +0000 (+0000)
Subject: fix convert_to_unicode() and convert_to_string() which didn't set the type of the... 
X-Git-Tag: RELEASE_1_0_0RC1~480
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da9f5e95bc275e5265b6eb81cb3b79aeec1e67e9;p=php

fix convert_to_unicode() and convert_to_string() which didn't set the type of the op properly
---

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index c085636844..df93a4827a 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -891,6 +891,7 @@ ZEND_API int _convert_to_unicode_with_converter(zval *op, UConverter *conv TSRML
 			zval_dtor(op);
 			Z_USTRVAL_P(op) = USTR_MAKE_REL("Array");
 			Z_USTRLEN_P(op) = sizeof("Array")-1;
+			Z_TYPE_P(op) = IS_UNICODE;
 			return FAILURE;
 		case IS_OBJECT: {
 			int retval = FAILURE;
@@ -929,6 +930,7 @@ ZEND_API int _convert_to_unicode_with_converter(zval *op, UConverter *conv TSRML
 			zval_dtor(op);
 			Z_USTRVAL_P(op) = USTR_MAKE_REL("Object");
 			Z_USTRLEN_P(op) = sizeof("Object")-1;
+			Z_TYPE_P(op) = IS_UNICODE;
 			return FAILURE;
 		}
 		default:
@@ -999,6 +1001,7 @@ ZEND_API int _convert_to_string_with_converter(zval *op, UConverter *conv TSRMLS
 			zval_dtor(op);
 			Z_STRVAL_P(op) = estrndup_rel("Array", sizeof("Array")-1);
 			Z_STRLEN_P(op) = sizeof("Array")-1;
+			Z_TYPE_P(op) = IS_STRING;
 			return FAILURE;
 		case IS_OBJECT: {
 			int retval = FAILURE;
@@ -1038,6 +1041,7 @@ ZEND_API int _convert_to_string_with_converter(zval *op, UConverter *conv TSRMLS
 			zval_dtor(op);
 			Z_STRVAL_P(op) = estrndup_rel("Object", sizeof("Object")-1);
 			Z_STRLEN_P(op) = sizeof("Object")-1;
+			Z_TYPE_P(op) = IS_STRING;
 			return FAILURE;
 		}
 		default: