From: Kim F. Storm <storm@cua.dk>
Date: Tue, 16 May 2006 10:54:48 +0000 (+0000)
Subject: (handle_one_xevent): Check that f is not NULL before
X-Git-Tag: emacs-pretest-22.0.90~2544
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fb6341e7fdb435afb232bc6468ed73ccd727bcd4;p=emacs.git

(handle_one_xevent): Check that f is not NULL before
calling x_kill_gs_process.
---

diff --git a/src/xterm.c b/src/xterm.c
index bc28f397073..bd0d6db9524 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -5821,6 +5821,8 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
                images, only, which should have 1 page.  */
             Pixmap pixmap = (Pixmap) event.xclient.data.l[1];
 	    f = x_window_to_frame (dpyinfo, event.xclient.window);
+	    if (!f)
+	      goto OTHER;
             x_kill_gs_process (pixmap, f);
             expose_frame (f, 0, 0, 0, 0);
 	    goto done;
@@ -5839,10 +5841,8 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
 #endif /* USE_TOOLKIT_SCROLL_BARS */
 
 	f = x_any_window_to_frame (dpyinfo, event.xclient.window);
-
 	if (!f)
 	  goto OTHER;
-
 	if (x_handle_dnd_message (f, &event.xclient, dpyinfo, &inev.ie))
 	  *finish = X_EVENT_DROP;
       }