archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-7.0' into PHP-7.1

Browse source
This commit is contained in:
Christoph M. Becker 2016-07-23 16:56:11 +02:00
commit 03eeea4aa5
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -2,6 +2,9 @@ PHP NEWS
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2016, PHP 7.1.0beta2 ?? ??? 2016, PHP 7.1.0beta2
-GD:
. Fixed bug #66555 (Always false condition in ext/gd/libgd/gdkanji.c). (cmb)
- Intl: - Intl:
. Fixed bug #72639 (Segfault when instantiating class that extends . Fixed bug #72639 (Segfault when instantiating class that extends
IntlCalendar and adds a property). (Laruence) IntlCalendar and adds a property). (Laruence)

2
ext/gd/libgd/gdkanji.c
View file

@ -329,7 +329,7 @@ han2zen (int *p1, int *p2)
{ {
if ((*p2 >= 74 && *p2 <= 103) || (*p2 >= 110 && *p2 <= 122)) if ((*p2 >= 74 && *p2 <= 103) || (*p2 >= 110 && *p2 <= 122))
(*p2)++; (*p2)++;
else if (*p2 == 131 && *p2 == 69) else if (*p2 == 131 || *p2 == 69)
*p2 = 148; *p2 = 148;
} }
else if (handaku && *p2 >= 110 && *p2 <= 122) else if (handaku && *p2 >= 110 && *p2 <= 122)