From 8ac639ba40cfe3f456fe8ab3a61b5ce0982d9f4a Mon Sep 17 00:00:00 2001 From: Kalle Sommer Nielsen Date: Tue, 19 May 2009 16:23:36 +0000 Subject: [PATCH] Fix unicode support in utf8_decode() --- ext/xml/xml.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 3f4770d38b..53b541bc83 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -1780,7 +1780,7 @@ PHP_FUNCTION(utf8_encode) PHP_FUNCTION(utf8_decode) { XML_Char *decoded; - char *data; + zstr data; int len, data_len; zend_uchar data_type; @@ -1789,9 +1789,9 @@ PHP_FUNCTION(utf8_decode) } if (data_type == IS_UNICODE) { - RETURN_UNICODEL(data, data_len, 1); + RETURN_UNICODEL(data.u, data_len, 1); } - decoded = xml_utf8_decode(data, data_len, &len, NULL); + decoded = xml_utf8_decode(data.s, data_len, &len, NULL); if (decoded == NULL) { RETURN_FALSE; -- 2.40.0