From: Andrei Zmievski <andrei@php.net>
Date: Fri, 19 Aug 2005 22:33:39 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: PRE_NEW_OCI8_EXTENSION~139
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da4721427a9ece484a3afc95478d67639cb8258c;p=php

*** empty log message ***
---

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 83c8afec79..4b103bb463 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -2949,6 +2949,8 @@ ZEND_API zend_uchar zend_get_unified_string_type(int num_args TSRMLS_DC, ...)
 			if (best_type == IS_STRING) {
 				best_type = IS_UNICODE;
 			}
+		} else if (type == IS_STRING) {
+			best_type = IS_STRING;
 		}
 	}
 	va_end(ap);
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index c09020e68e..44937c7152 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -671,7 +671,7 @@ END_EXTERN_C()
 #define ZVAL_TEXT(z, t, duplicate)					\
 		do {										\
 			if (UG(unicode)) {						\
-				ZVAL_UNICODE(z, t, duplicate);		\
+				ZVAL_UNICODE(z, (UChar*)t, duplicate);		\
 			} else {								\
 				ZVAL_STRING(z, t, duplicate);		\
 			}										\
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index f6bcf1f875..9a0604228f 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -265,7 +265,7 @@ ZEND_API int zend_check_property_access(zend_object *zobj, zend_uchar utype, voi
 		if (!(property_info->flags & ZEND_ACC_PRIVATE)) {
 			/* we we're looking for a private prop but found a non private one of the same name */
 			return FAILURE;
-		} else if (!UG(unicode) && strcmp(prop_info_name+1, property_info->name+1)) {
+		} else if (!UG(unicode) && strcmp((char*)prop_info_name+1, property_info->name+1)) {
 			/* we we're looking for a private prop but found a private one of the same name but another class */
 			return FAILURE;
 		} else if (UG(unicode) && u_strcmp(((UChar*)prop_info_name)+1, ((UChar*)property_info->name)+1)) {