com php-src: Fix #66555: Always false condition in ext/gd/libgd/gdkanji.c: NEWS ext/gd/libgd/gdkanji.c
| From: | Christoph Michael Becker | Date: | Sat, 23 Jul 2016 14:48:07 +0000 |
| Subject: | com php-src: Fix #66555: Always false condition in ext/gd/libgd/gdkanji.c: NEWS ext/gd/libgd/gdkanji.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93344@lists.php.net to get a copy of this message | ||
Commit: 2c16b9cf62072afefb9a318f4a503bb9335f8537
Author: Christoph M. Becker <cmb@php.net> Sat, 23 Jul 2016 16:48:07 +0200
Parents: 65abdb556ddf67068951020b8829c0817697a84e
Branches: PHP-5.6 PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2c16b9cf62072afefb9a318f4a503bb9335f8537
Log:
Fix #66555: Always false condition in ext/gd/libgd/gdkanji.c
This issue has already been fixed in libgd[1], so we fix PHP's bundled
libgd accordingly.
[1] <https://github.com/libgd/libgd/commit/aa1d71c>
Bugs:
https://bugs.php.net/66555
Changed paths:
M NEWS
M ext/gd/libgd/gdkanji.c
Diff:
diff --git a/NEWS b/NEWS
index f264bed..b3000bd 100644
--- a/NEWS
+++ b/NEWS
@@ -32,6 +32,7 @@ PHP NEWS
. Fixed bug #70315 (500 Server Error but page is fully rendered). (cmb)
. Fixed bug #43828 (broken transparency of imagearc for truecolor in
blendingmode). (cmb)
+ . Fixed bug #66555 (Always false condition in ext/gd/libgd/gdkanji.c). (cmb)
- Intl:
. Partially fixed #72506 (idn_to_ascii for UTS #46 incorrect for long domain
@@ -73,7 +74,7 @@ PHP NEWS
applications). (CVE-2016-5385) (Stas)
- bz2:
- . Fixed bug #72447 (Type Confusion in php_bz2_filter_create()). (gogil at
+ . Fixed bug #72447 (Type Confusion in php_bz2_filter_create()). (gogil at
stealien dot com).
. Fixed bug #72613 (Inadequate error handling in bzread()). (Stas)
diff --git a/ext/gd/libgd/gdkanji.c b/ext/gd/libgd/gdkanji.c
index 37f3bd1..be853c5 100644
--- a/ext/gd/libgd/gdkanji.c
+++ b/ext/gd/libgd/gdkanji.c
@@ -330,7 +330,7 @@ han2zen (int *p1, int *p2)
{
if ((*p2 >= 74 && *p2 <= 103) || (*p2 >= 110 && *p2 <= 122))
(*p2)++;
- else if (*p2 == 131 && *p2 == 69)
+ else if (*p2 == 131 || *p2 == 69)
*p2 = 148;
}
else if (handaku && *p2 >= 110 && *p2 <= 122)