MFH: Fixed bug #24223 (missing variable initialization in bundled gd)

diff --git a/ext/gd/libgd/gdft.c b/ext/gd/libgd/gdft.c
index f328fddcc8970089a2ff68606bbb93e0ef5ffc7a..f697bfe7503ce892e58fec70ab9f858cc9e22254 100644 (file)
--- a/ext/gd/libgd/gdft.c
+++ b/ext/gd/libgd/gdft.c
@@ -889,11 +889,16 @@ gdImageStringFTEx (gdImage * im, int *brect, int fg, char *fontlist, double ptsi
        }
 
 #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;