CVS update by stephent xemacs/src ...

[xemacs-cvs at xemacs.org]

  User: stephent
  Date: 07/02/19 15:10:46

  Modified:    xemacs/src ChangeLog specifier.c
Log:
Fix specifier tag alist dereference crash. <87wt2emdwe.fsf at uwakimon.sk.tsukuba.ac.jp>

Revision  Changes    Path
1.1046    +8 -0      XEmacs/xemacs/src/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.1045
retrieving revision 1.1046
diff -u -p -r1.1045 -r1.1046
--- ChangeLog	2007/02/17 15:55:21	1.1045
+++ ChangeLog	2007/02/19 14:10:43	1.1046
@@ -1,3 +1,11 @@
+2007-02-19  Stephen J. Turnbull  <stephen at xemacs.org>
+
+	* specifier.c (Fdevice_matching_specifier_tag_list):
+	Don't take XCDR of possible non-cons.  Avoids crash in VM introduced
+	or unmasked by Aidan's 2007-02-06 patch.
+
+	(setup_device_initial_specifier_tags): Nuke unused variable.
+
 2007-02-18  Stephen J. Turnbull  <stephen at xemacs.org>
 
 	Code by Mike FABIAN <mfabian at suse.de>, Takashi Iwai <tiwai at suse.de>.



1.53      +2 -2      XEmacs/xemacs/src/specifier.c

Index: specifier.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/specifier.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- specifier.c	2007/02/06 20:01:42	1.52
+++ specifier.c	2007/02/19 14:10:44	1.53
@@ -1293,7 +1293,7 @@ setup_device_initial_specifier_tags (str
 {
   Lisp_Object rest, rest2;
   Lisp_Object device = wrap_device (d);
-  Lisp_Object device_predicate, charset_predicate;
+  Lisp_Object device_predicate;
   int list_len;
 
   DEVICE_USER_DEFINED_TAGS (d) = Fcopy_alist (Vuser_defined_tags);
@@ -1395,7 +1395,7 @@ DEVICE defaults to the selected device i
 
   LIST_LOOP (rest, DEVICE_USER_DEFINED_TAGS (d))
     {
-      if (!NILP (XCADR (XCAR (rest))))
+      if (!NILP (XCDR (XCAR (rest))))
 	list = Fcons (XCAR (XCAR (rest)), list);
     }