cvs: php4 /ext/gd/libgd gdft.c
| From: | Ilia Alshanetsky | Date: | Tue, 17 Jun 2003 13:37:43 +0000 |
| Subject: | cvs: php4 /ext/gd/libgd gdft.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-21822@lists.php.net to get a copy of this message | ||
iliaa Tue Jun 17 09:37:43 2003 EDT
Modified files:
/php4/ext/gd/libgd gdft.c
Log:
Fixed bug #24223 (missing variable initialization in bundled gd)
Index: php4/ext/gd/libgd/gdft.c
diff -u php4/ext/gd/libgd/gdft.c:1.23 php4/ext/gd/libgd/gdft.c:1.24
--- php4/ext/gd/libgd/gdft.c:1.23 Tue Jun 3 19:54:56 2003
+++ php4/ext/gd/libgd/gdft.c Tue Jun 17 09:37:43 2003
@@ -889,11 +889,16 @@
}
#ifndef JISX0208
- if (!font->have_char_map_sjis) {
- next = string;
- } else
+ if (font->have_char_map_sjis) {
#endif
tmpstr = (char *) gdMalloc(BUFSIZ);
+ any2eucjp(tmpstr, string, BUFSIZ);
+ next = tmpstr;
+#ifndef JISX0208
+ } else {
+ next = string;
+ }
+#endif
while (*next) {
ch = *next;