[Emacs-diffs] /srv/bzr/emacs/trunk r105039: * src/w32fns.c (w32_wnd_proc) [WM_TIMER, WM_SET_CURSOR]: Avoid using

[Jason Rumney]

------------------------------------------------------------
revno: 105039
fixes bug(s): http://debbugs.gnu.org/6284
committer: Jason Rumney <address@hidden>
branch nick: trunk
timestamp: Fri 2011-07-08 20:46:17 +0800
message:
  * src/w32fns.c (w32_wnd_proc) [WM_TIMER, WM_SET_CURSOR]: Avoid using
  frame struct members of non-existent frames.
modified:
  src/ChangeLog
  src/w32fns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-07-08 10:04:23 +0000
+++ b/src/ChangeLog     2011-07-08 12:46:17 +0000
@@ -1,3 +1,8 @@
+2011-07-08  Jason Rumney  <address@hidden>
+
+       * w32fns.c (w32_wnd_proc) [WM_TIMER, WM_SET_CURSOR]: Avoid using
+       frame struct members of non-existent frames (Bug#6284).
+
 2011-07-08  Jan Djärv  <address@hidden>
 
        * nsterm.m (keyDown): Call to wantsToDelayTextChangeNotifications and

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2011-07-04 18:31:29 +0000
+++ b/src/w32fns.c      2011-07-08 12:46:17 +0000
@@ -3273,7 +3273,8 @@
            {
              /* Free memory used by owner-drawn and help-echo strings.  */
              w32_free_menu_strings (hwnd);
-             f->output_data.w32->menubar_active = 0;
+             if (f)
+               f->output_data.w32->menubar_active = 0;
               menubar_in_use = 0;
            }
        }
@@ -3623,10 +3624,10 @@
       if (LOWORD (lParam) == HTCLIENT)
        {
          f = x_window_to_frame (dpyinfo, hwnd);
-         if (f->output_data.w32->hourglass_p && !menubar_in_use
-             && !current_popup_menu)
+         if (f && f->output_data.w32->hourglass_p
+             && !menubar_in_use && !current_popup_menu)
            SetCursor (f->output_data.w32->hourglass_cursor);
-         else
+         else if (f)
            SetCursor (f->output_data.w32->current_cursor);
          return 0;
        }