(select_palette): Avoid calling SelectPalette if

palette is NULL, since this corrupts memory!  Also get
display_info reference from frame.

1 files changed, 9 insertions, 1 deletions

diff --git a/src/w32xfns.c b/src/w32xfns.c
index 018aefdf35..9117f7e91a 100644
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -84,9 +84,17 @@ signal_quit ()
 void
 select_palette (FRAME_PTR f, HDC hdc)
 {
+  struct w32_display_info *display_info = FRAME_W32_DISPLAY_INFO (f);
+
+  if (!display_info->has_palette)
+    return;
+
+  if (display_info->palette == 0)
+    abort ();
+
   if (!NILP (Vw32_enable_palette))
     f->output_data.w32->old_palette =
-      SelectPalette (hdc, one_w32_display_info.palette, FALSE);
+      SelectPalette (hdc, display_info->palette, FALSE);
   else
     f->output_data.w32->old_palette = NULL;