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-5.4' into PHP-5.5

Browse source 
* PHP-5.4:
  Switch use of strtok() to gd_strtok_r()

Conflicts:
	NEWS
This commit is contained in:
Sara Golemon 2014-08-19 13:17:56 -07:00
commit ac4569621d
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -20,6 +20,9 @@ PHP NEWS
. Fixed bug #67109 (First uppercase letter breaks date string parsing). . Fixed bug #67109 (First uppercase letter breaks date string parsing).
(Derick) (Derick)
- GD
. Made fontFetch's path parser thread-safe. (Sara).
?? ??? 2014, PHP 5.5.16 ?? ??? 2014, PHP 5.5.16
- COM: - COM:

6
ext/gd/libgd/gdft.c
View file

@ -370,9 +370,10 @@ static void *fontFetch (char **error, void *key)
fontlist = gdEstrdup(a->fontlist); fontlist = gdEstrdup(a->fontlist);
/* /*
* Must use gd_strtok_r else pointer corrupted by strtok in nested loop. * Must use gd_strtok_r becasuse strtok() isn't thread safe
*/ */
for (name = gd_strtok_r (fontlist, LISTSEPARATOR, &strtok_ptr); name; name = gd_strtok_r (0, LISTSEPARATOR, &strtok_ptr)) { for (name = gd_strtok_r (fontlist, LISTSEPARATOR, &strtok_ptr); name; name = gd_strtok_r (0, LISTSEPARATOR, &strtok_ptr)) {
char *strtok_ptr_path;
/* make a fresh copy each time - strtok corrupts it. */ /* make a fresh copy each time - strtok corrupts it. */
path = gdEstrdup (fontsearchpath); path = gdEstrdup (fontsearchpath);
@ -388,7 +389,8 @@ static void *fontFetch (char **error, void *key)
break; break;
} }
} }
for (dir = strtok (path, PATHSEPARATOR); dir; dir = strtok (0, PATHSEPARATOR)) { for (dir = gd_strtok_r (path, PATHSEPARATOR, &strtok_ptr_path); dir;
dir = gd_strtok_r (0, PATHSEPARATOR, &strtok_ptr_path)) {
if (!strcmp(dir, ".")) { if (!strcmp(dir, ".")) {
TSRMLS_FETCH(); TSRMLS_FETCH();
#if HAVE_GETCWD #if HAVE_GETCWD