MFH: corrected valid unicode area.

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8.c b/ext/mbstring/libmbfl/filters/mbfilter_utf8.c
index 26c57b4248532ef86d548c63caf1d674e20800f6..41671344328dd46cb9506dd306af55cb394a4575 100644 (file)
--- 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 370a64594296ba2b6a23c2cb058565e02e6e3c05..a5e2b0f2b47e68a96643d1204b6e401f4ee33b7c 100644 (file)
--- 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) {