summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2003-06-17 13:37:43 +0000
committerIlia Alshanetsky <iliaa@php.net>2003-06-17 13:37:43 +0000
commitcadc8a15f939fa51eb4ac4ce38d8837b223c172e (patch)
treea5d993b39e1f5c7103fa5c5ceefcb115c3da04dc
parentabe8647eb4ab7452872e5eefa7db8d77c88458e5 (diff)
downloadphp-git-cadc8a15f939fa51eb4ac4ce38d8837b223c172e.tar.gz
Fixed bug #24223 (missing variable initialization in bundled gd)
-rw-r--r--ext/gd/libgd/gdft.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/ext/gd/libgd/gdft.c b/ext/gd/libgd/gdft.c
index 38b1b88bfc..f642e0d7f5 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;