From bedb3089023dcfa610f3ce2ebbbae94da425c462 Mon Sep 17 00:00:00 2001 From: Rui Hirokawa Date: Sat, 16 Feb 2008 12:01:43 +0000 Subject: fixed #43998 Two error messages returned for incorrect encoding for mb_strto[upper|lower] --- ext/mbstring/php_unicode.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ext/mbstring/php_unicode.c') diff --git a/ext/mbstring/php_unicode.c b/ext/mbstring/php_unicode.c index ca30db73b2..d90cabb84d 100644 --- a/ext/mbstring/php_unicode.c +++ b/ext/mbstring/php_unicode.c @@ -276,6 +276,11 @@ MBSTRING_API char *php_unicode_convert_case(int case_mode, char *srcstr, size_t size_t i; enum mbfl_no_encoding _src_encoding = mbfl_name2no_encoding(src_encoding); + if (_src_encoding == mbfl_no_encoding_invalid) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", src_encoding); + return NULL; + } + unicode = php_mb_convert_encoding(srcstr, srclen, "UCS-4BE", src_encoding, &unicode_len TSRMLS_CC); if (unicode == NULL) return NULL; -- cgit v1.2.1