com php-src: added missing parentheses: ext/mbstring/libmbfl/fi lters/mbfilter_gb18030.c ext/mbstring/tests/bug 68846.phpt
| From: | Stanislav Malyshev | Date: | Mon, 09 Mar 2015 06:45:11 +0000 |
| Subject: | com php-src: added missing parentheses: ext/mbstring/libmbfl/fi lters/mbfilter_gb18030.c ext/mbstring/tests/bug 68846.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85383@lists.php.net to get a copy of this message | ||
Commit: 9d81d7ff70657554f3524b5728cfb1db0ae5a4ae
Author: Masaki Kagaya <masakielastic@gmail.com> Wed, 18 Feb 2015 23:17:39 +0900
Committer: Stanislav Malyshev <stas@php.net> Sun, 8 Mar 2015 23:45:11 -0700
Parents: 2f06413340655a76024612c5c861b4b8f43555e1
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9d81d7ff70657554f3524b5728cfb1db0ae5a4ae
Log:
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
Bugs:
https://bugs.php.net/68846
Changed paths:
M ext/mbstring/libmbfl/filters/mbfilter_gb18030.c
A ext/mbstring/tests/bug68846.phpt
Diff:
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c
b/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c
index a5ead7a..721c162 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) {
diff --git a/ext/mbstring/tests/bug68846.phpt b/ext/mbstring/tests/bug68846.phpt
new file mode 100644
index 0000000..1b43e3d
--- /dev/null
+++ b/ext/mbstring/tests/bug68846.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Bug #68846 False detection of CJK Unified Ideographs Extension E
+--SKIPIF--
+<?php extension_loaded('mbstring') or die('skip mbstring not available');
?>
+--FILE--
+<?php
+var_dump(
+ "\x00\x02\x0b\xb7" === mb_convert_encoding("\x95\x34\xb2\x35",
'UTF-32', 'GB18030')
+);
+?>
+--EXPECT--
+bool(true)
\ No newline at end of file