diff options
| author | Daniel Colascione <dancol@dancol.org> | 2012-09-01 00:22:10 -0800 |
|---|---|---|
| committer | Daniel Colascione <dancol@dancol.org> | 2012-09-01 00:22:10 -0800 |
| commit | 86571ae075b3fedc4b7312738fe99af9b7991f69 (patch) | |
| tree | ed5b0018956ff5a984a32dc17cf5bbc023d560e5 /src | |
| parent | 0a850e9a4eff07824bba57892bf27ce9767559bd (diff) | |
| download | emacs-86571ae075b3fedc4b7312738fe99af9b7991f69.tar.gz | |
Prevent crash if w32 used before it's initialized
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/w32fns.c | 2 |
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; |