fix convert_to_unicode() and convert_to_string() which didn't set the type of the...

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index c08563684442a5d691c835830a2f783d2c29e9dc..df93a4827a5340a212a3cd6d749608e5a1ce6dc4 100644 (file)
--- 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: