User: stephent
Date: 06/03/17 15:30:47
Modified: xemacs/src ChangeLog objects-x.c
Log:
eliminate bogus pointer to nowhere in x_font_instance_truename <874q1xgn5d.fsf(a)tleepslib.sk.tsukuba.ac.jp>
Revision Changes Path
1.928 +5 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.927
retrieving revision 1.928
diff -u -p -r1.927 -r1.928
--- ChangeLog 2006/03/14 19:31:41 1.927
+++ ChangeLog 2006/03/17 14:30:43 1.928
@@ -1,3 +1,8 @@
+2006-03-17 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * objects-x.c (x_font_instance_truename):
+ Eliminate bogus pointer to nowhere.
+
2006-03-09 Jerry James <james(a)xemacs.org>
* profile.h (RETURN_UNGCPRO_EXIT_PROFILING): Add missing do.
1.37 +1 -4 XEmacs/xemacs/src/objects-x.c
Index: objects-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- objects-x.c 2006/01/20 17:50:46 1.36
+++ objects-x.c 2006/03/17 14:30:45 1.37
@@ -794,7 +794,6 @@ x_font_instance_truename (Lisp_Font_Inst
struct device *d = XDEVICE (f->device);
Display *dpy = DEVICE_X_DISPLAY (d);
Extbyte *nameext;
- char* xlfd;
/* #### restructure this so that we return a valid truename at the end,
and otherwise only return when we return something desperate that
@@ -827,9 +826,7 @@ x_font_instance_truename (Lisp_Font_Inst
if (NILP (FONT_INSTANCE_TRUENAME (f))
&& FONT_INSTANCE_X_FONT (f))
{
- nameext = &xlfd[0];
- LISP_STRING_TO_EXTERNAL (f->name, nameext, Qx_font_name_encoding);
-
+ nameext = NEW_LISP_STRING_TO_EXTERNAL (f->name, Qx_font_name_encoding);
FONT_INSTANCE_TRUENAME (f) =
x_font_truename (dpy, nameext, FONT_INSTANCE_X_FONT (f));
}