diff options
| author | Rui Hirokawa <hirokawa@php.net> | 2011-08-06 02:22:38 +0000 |
|---|---|---|
| committer | Rui Hirokawa <hirokawa@php.net> | 2011-08-06 02:22:38 +0000 |
| commit | d322b26fb4773843750856e95db5f12be385a6ba (patch) | |
| tree | e9755e35780d691a354e06d02a8dfcac05df94a0 | |
| parent | 7bc77208f3f4872723cc3da167f08cd2a00f7faa (diff) | |
| download | php-git-d322b26fb4773843750856e95db5f12be385a6ba.tar.gz | |
MFH: added ill-formed utf-8 check for 0xEDXXXX.
| -rw-r--r-- | ext/mbstring/libmbfl/filters/mbfilter_utf8.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8.c b/ext/mbstring/libmbfl/filters/mbfilter_utf8.c index 6e81fbc1c4..94aaadd8aa 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf8.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8.c @@ -124,10 +124,12 @@ int mbfl_filt_conv_utf8_wchar(int c, mbfl_convert_filter *filter) CK((*filter->output_function)(w, filter->data)); } break; - case 0x20: /* 3byte code 2nd char: 0:0xa0-0xbf,1-F:0x80-0x9f */ + case 0x20: /* 3byte code 2nd char: 0:0xa0-0xbf,D:0x80-9F,1-C,E-F:0x80-0x9f */ s = filter->cache | ((c & 0x3f) << 6); c1 = (s >> 12) & 0xf; - if ((c1 == 0x0 && c >= 0xa0) || c1 > 0) { + if ((c1 == 0x0 && c >= 0xa0) || + (c1 == 0xd && c < 0xa0) || + (c1 > 0x0 && c1 != 0xd)) { filter->cache = s; filter->status++; } else { @@ -235,7 +237,9 @@ static int mbfl_filt_ident_utf8(int c, mbfl_identify_filter *filter) } else if (c < 0xc0) { switch (filter->status) { case 0x20: /* 3 byte code 2nd char */ - if ((c1 == 0x0 && c >= 0xa0) || c1 > 0x0) { + if ((c1 == 0x0 && c >= 0xa0) || + (c1 == 0xd && c < 0xa0) || + (c1 > 0x0 && c1 != 0xd)) { filter->status++; } else { filter->flag = 1; /* bad */ |