[Emacs-diffs] /srv/bzr/emacs/trunk r109837: Prevent crash if w32 used before it's initialized

[Daniel Colascione]

------------------------------------------------------------
revno: 109837
committer: Daniel Colascione <address@hidden>
branch nick: trunk
timestamp: Sat 2012-09-01 00:22:10 -0800
message:
  Prevent crash if w32 used before it's initialized
modified:
  src/ChangeLog
  src/w32fns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-01 08:01:36 +0000
+++ b/src/ChangeLog     2012-09-01 08:22:10 +0000
@@ -1,3 +1,8 @@
+2012-09-01  Daniel Colascione  <address@hidden>
+
+       * w32fns.c (x_display_info_for_name): Prevent crash if w32 window
+       system used too early.
+
 2012-09-01  Paul Eggert  <address@hidden>
 
        Better seed support for (random).

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2012-08-18 06:06:39 +0000
+++ b/src/w32fns.c      2012-09-01 08:22:10 +0000
@@ -4735,7 +4735,7 @@
   CHECK_STRING (name);
 
   for (dpyinfo = &one_w32_display_info, names = w32_display_name_list;
-       dpyinfo;
+       dpyinfo && !NILP (w32_display_name_list);
        dpyinfo = dpyinfo->next, names = XCDR (names))
     {
       Lisp_Object tem;