From: Rui Hirokawa <hirokawa@php.net>
Date: Sun, 17 Feb 2008 02:01:41 +0000 (+0000)
Subject: MF PHP5_3 (fixed #43998)
X-Git-Tag: php-5.2.6RC1~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2fa604b0a5e79c04c1d0a9ecaf43dab62007067;p=php

MF PHP5_3 (fixed #43998)
---

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;