cvs: php4(PHP_4_3) /ext/gd/libgd gdft.c
| From: | Ilia Alshanetsky | Date: | Tue, 17 Jun 2003 13:37:57 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/gd/libgd gdft.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-21823@lists.php.net to get a copy of this message | ||
iliaa Tue Jun 17 09:37:57 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/gd/libgd gdft.c
Log:
MFH: 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.11.2.9 php4/ext/gd/libgd/gdft.c:1.11.2.10
--- php4/ext/gd/libgd/gdft.c:1.11.2.9 Tue Jun 3 19:55:15 2003
+++ php4/ext/gd/libgd/gdft.c Tue Jun 17 09:37:57 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;