From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 17 Jun 2003 13:37:57 +0000 (+0000)
Subject: MFH: Fixed bug #24223 (missing variable initialization in bundled gd)
X-Git-Tag: php-4.3.3RC1~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7812b45b3698244eaf6478bafe34ae4be41ada97;p=php

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 f328fddcc8..f697bfe750 100644
--- 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;