]> granicus.if.org Git - php/commitdiff
fixed #43998 Two error messages returned for incorrect encoding for mb_strto[upper...
authorRui Hirokawa <hirokawa@php.net>
Sat, 16 Feb 2008 12:01:43 +0000 (12:01 +0000)
committerRui Hirokawa <hirokawa@php.net>
Sat, 16 Feb 2008 12:01:43 +0000 (12:01 +0000)
ext/mbstring/php_unicode.c

index ca30db73b203fa6275e8660ec878046accc0934d..d90cabb84d99c30dc163e573ee880c665f23f479 100644 (file)
@@ -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;