[Emacs-diffs] /srv/bzr/emacs/trunk r107722: Fixes: debbugs:11141

[Andreas Schwab]

------------------------------------------------------------
revno: 107722
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sun 2012-04-01 18:42:57 +0200
message:
  Fixes: debbugs:11141
  
  * w32menu.c (is_simple_dialog): Properly check lisp types.
modified:
  src/ChangeLog
  src/w32menu.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-03-31 19:30:53 +0000
+++ b/src/ChangeLog     2012-04-01 16:42:57 +0000
@@ -1,3 +1,8 @@
+2012-04-01  Andreas Schwab  <address@hidden>
+
+       * w32menu.c (is_simple_dialog): Properly check lisp types.
+       (Bug#11141)
+
 2012-03-31  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (move_it_by_lines): When DVPOS is positive, and the

=== modified file 'src/w32menu.c'
--- a/src/w32menu.c     2012-01-19 07:21:25 +0000
+++ b/src/w32menu.c     2012-04-01 16:42:57 +0000
@@ -1173,18 +1173,23 @@
 static int
 is_simple_dialog (Lisp_Object contents)
 {
-  Lisp_Object options = XCDR (contents);
+  Lisp_Object options;
   Lisp_Object name, yes, no, other;
 
+  if (!CONSP (contents))
+    return 0;
+  options = XCDR (contents);
+
   yes = build_string ("Yes");
   no = build_string ("No");
 
   if (!CONSP (options))
     return 0;
 
-  name = XCAR (XCAR (options));
-  if (!CONSP (options))
+  name = XCAR (options);
+  if (!CONSP (name))
     return 0;
+  name = XCAR (name);
 
   if (!NILP (Fstring_equal (name, yes)))
     other = no;
@@ -1197,7 +1202,10 @@
   if (!CONSP (options))
     return 0;
 
-  name = XCAR (XCAR (options));
+  name = XCAR (options);
+  if (!CONSP (name))
+    return 0;
+  name = XCAR (name);
   if (NILP (Fstring_equal (name, other)))
     return 0;