From: Rui Hirokawa <hirokawa@php.net>
Date: Sat, 27 Aug 2011 01:25:24 +0000 (+0000)
Subject: MFH: corrected valid unicode area.
X-Git-Tag: php-5.4.0beta1~370
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a53bdab0be36a35e069cecb5b3fcda513a13dd6;p=php

MFH: corrected valid unicode area.
---

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8.c b/ext/mbstring/libmbfl/filters/mbfilter_utf8.c
index 26c57b4248..4167134432 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_utf8.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8.c
@@ -116,7 +116,7 @@ int mbfl_filt_conv_utf8_wchar(int c, mbfl_convert_filter *filter)
 			filter->cache = 0;
 			if ((status == 0x10 && s >= 0x80) ||
 			    (status == 0x21 && s >= 0x800 && (s < 0xd800 || s > 0xdfff)) ||
-			    (status == 0x32 && s >= 0x10000 && s < 0x200000)) {
+			    (status == 0x32 && s >= 0x10000 && s < 0x110000)) {
 				CK((*filter->output_function)(s, filter->data));
 			} else {
 				w = s & MBFL_WCSGROUP_MASK;
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
index 370a645942..a5e2b0f2b4 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
@@ -207,7 +207,7 @@ int mbfl_filt_conv_utf8_mobile_wchar(int c, mbfl_convert_filter *filter)
 			filter->cache = 0;
 			if ((status == 0x10 && s >= 0x80) ||
 			    (status == 0x21 && s >= 0x800 && (s < 0xd800 || s > 0xdfff)) ||
-			    (status == 0x32 && s >= 0x10000 && s < 0x200000)) {
+			    (status == 0x32 && s >= 0x10000 && s < 0x110000)) {
 				
 				if (filter->from->no_encoding == mbfl_no_encoding_utf8_docomo &&
 					mbfilter_conv_r_map_tbl(s, &s1, mbfl_docomo2uni_pua, 4) > 0) {