cvs: gd(GD_2_0) /libgd/src gdft.c

From: Date: Sat, 02 Aug 2008 14:43:45 +0000
Subject: cvs: gd(GD_2_0) /libgd/src gdft.c
Groups: php.gd.cvs 
Request: Send a blank email to php-gd-cvs+get-523@lists.php.net to get a copy of this message
tabe Sat Aug 2 14:43:45 2008 UTC Modified files: (Branch: GD_2_0) /gd/libgd/src gdft.c Log: fixed FS#174: use gd_strtok_r instead of strtok. http://cvs.php.net/viewvc.cgi/gd/libgd/src/gdft.c?r1=1.28.2.10&r2=1.28.2.11&diff_format=u Index: gd/libgd/src/gdft.c diff -u gd/libgd/src/gdft.c:1.28.2.10 gd/libgd/src/gdft.c:1.28.2.11 --- gd/libgd/src/gdft.c:1.28.2.10 Thu Jul 31 15:24:01 2008 +++ gd/libgd/src/gdft.c Sat Aug 2 14:43:45 2008 @@ -1573,6 +1573,7 @@ for (name = gd_strtok_r (fontlist, LISTSEPARATOR, &strtok_ptr); name; name = gd_strtok_r (0, LISTSEPARATOR, &strtok_ptr)) { + char *path_ptr; /* make a fresh copy each time - strtok corrupts it. */ path = strdup (fontsearchpath); @@ -1607,8 +1608,8 @@ break; } } - for (dir = strtok (path, PATHSEPARATOR); dir; - dir = strtok (0, PATHSEPARATOR)) + for (dir = gd_strtok_r (path, PATHSEPARATOR, &path_ptr); dir; + dir = gd_strtok_r (0, PATHSEPARATOR, &path_ptr)) { if (strchr (name, '.')) {

« previous php.gd.cvs (#523) next »