diff --git a/NEWS b/NEWS index ea28d6cf70c..1733fe8ef3c 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2016, PHP 7.1.0beta2 +-GD: + . Fixed bug #66555 (Always false condition in ext/gd/libgd/gdkanji.c). (cmb) + - Intl: . Fixed bug #72639 (Segfault when instantiating class that extends IntlCalendar and adds a property). (Laruence) diff --git a/ext/gd/libgd/gdkanji.c b/ext/gd/libgd/gdkanji.c index 2f6110c5324..3158e077c32 100644 --- a/ext/gd/libgd/gdkanji.c +++ b/ext/gd/libgd/gdkanji.c @@ -329,7 +329,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)