From 723d7029d8885dae5e589c11c04d676a5c6a0318 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Wed, 14 Sep 2011 15:00:28 +0000 Subject: [PATCH] Fixed bug #55552 (bad encoding not detected) --- Zend/zend_multibyte.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Zend/zend_multibyte.c b/Zend/zend_multibyte.c index 775ea78f5e..719dd8dd10 100644 --- a/Zend/zend_multibyte.c +++ b/Zend/zend_multibyte.c @@ -32,7 +32,7 @@ static const zend_encoding *dummy_encoding_fetcher(const char *encoding_name TSR static const char *dummy_encoding_name_getter(const zend_encoding *encoding) { - return NULL; + return (const char*)encoding; } static int dummy_encoding_lexer_compatibility_checker(const zend_encoding *encoding) @@ -79,11 +79,11 @@ static zend_multibyte_functions multibyte_functions = { dummy_internal_encoding_setter }; -ZEND_API const zend_encoding *zend_multibyte_encoding_utf32be; -ZEND_API const zend_encoding *zend_multibyte_encoding_utf32le; -ZEND_API const zend_encoding *zend_multibyte_encoding_utf16be; -ZEND_API const zend_encoding *zend_multibyte_encoding_utf16le; -ZEND_API const zend_encoding *zend_multibyte_encoding_utf8; +ZEND_API const zend_encoding *zend_multibyte_encoding_utf32be = (const zend_encoding*)"UTF-32BE"; +ZEND_API const zend_encoding *zend_multibyte_encoding_utf32le = (const zend_encoding*)"UTF-32LE"; +ZEND_API const zend_encoding *zend_multibyte_encoding_utf16be = (const zend_encoding*)"UTF-16BE"; +ZEND_API const zend_encoding *zend_multibyte_encoding_utf16le = (const zend_encoding*)"UTF-32LE"; +ZEND_API const zend_encoding *zend_multibyte_encoding_utf8 = (const zend_encoding*)"UTF-8"; ZEND_API int zend_multibyte_set_functions(const zend_multibyte_functions *functions TSRMLS_DC) { -- 2.50.1