Prevent crash if w32 used before it's initialized

2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3c878d5850f..cfa60cbcf66 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-01  Daniel Colascione  <dancol@dancol.org>
+
+        * w32fns.c (x_display_info_for_name): Prevent crash if w32 window
+        system used too early.
+
 2012-09-01  Paul Eggert  <eggert@cs.ucla.edu>
 
         Better seed support for (random).
diff --git a/src/w32fns.c b/src/w32fns.c
index 9c5231f9d93..5a1b6dfabab 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -4735,7 +4735,7 @@ x_display_info_for_name (Lisp_Object name)
   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;