diff options
| author | Masaki Kagaya <masakielastic@gmail.com> | 2015-02-18 23:17:39 +0900 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-03-08 23:45:11 -0700 |
| commit | 9d81d7ff70657554f3524b5728cfb1db0ae5a4ae (patch) | |
| tree | b23a3fb01da30190d880b41794bf7287e2c2b5a8 /ext/mbstring/libmbfl/filters/mbfilter_gb18030.c | |
| parent | 2f06413340655a76024612c5c861b4b8f43555e1 (diff) | |
| download | php-git-9d81d7ff70657554f3524b5728cfb1db0ae5a4ae.tar.gz | |
added missing parentheses
added test case for bug #68846
replaced tab with space
added missing parentheses again
See also: http://icu-project.org/docs/papers/gb18030.html#h7
Diffstat (limited to 'ext/mbstring/libmbfl/filters/mbfilter_gb18030.c')
| -rw-r--r-- | ext/mbstring/libmbfl/filters/mbfilter_gb18030.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c b/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c index a5ead7a693..721c16292b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c @@ -239,7 +239,7 @@ mbfl_filt_conv_gb18030_wchar(int c, mbfl_convert_filter *filter) if (((c1 >= 0x81 && c1 <= 0x84) || (c1 >= 0x90 && c1 <= 0xe3)) && c2 >= 0x30 && c2 <= 0x39 && c3 >= 0x81 && c3 <= 0xfe && c >= 0x30 && c <= 0x39) { if (c1 >= 0x90 && c1 <= 0xe3) { - w = ((c1 - 0x90)*10 + (c2 - 0x30)*126 + (c3 - 0x81))*10 + (c - 0x30) + 0x10000; + w = ((((c1 - 0x90)*10 + (c2 - 0x30))*126 + (c3 - 0x81)))*10 + (c - 0x30) + 0x10000; } else { /* Unicode BMP */ w = (((c1 - 0x81)*10 + (c2 - 0x30))*126 + (c3 - 0x81))*10 + (c - 0x30); if (w >= 0 && w <= 39419) { |