diff options
| author | Rui Hirokawa <hirokawa@php.net> | 2011-08-27 01:25:24 +0000 |
|---|---|---|
| committer | Rui Hirokawa <hirokawa@php.net> | 2011-08-27 01:25:24 +0000 |
| commit | 4a53bdab0be36a35e069cecb5b3fcda513a13dd6 (patch) | |
| tree | a88294ffea6579557e843b4e3de9eb3c9edc37ab | |
| parent | d19bfc5d828e995a3b7c9d7d4183a7e645ca176b (diff) | |
| download | php-git-4a53bdab0be36a35e069cecb5b3fcda513a13dd6.tar.gz | |
MFH: corrected valid unicode area.
| -rw-r--r-- | ext/mbstring/libmbfl/filters/mbfilter_utf8.c | 2 | ||||
| -rw-r--r-- | ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c | 2 |
2 files changed, 2 insertions, 2 deletions
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) { |