aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim F. Storm2006-05-16 10:54:48 +0000
committerKim F. Storm2006-05-16 10:54:48 +0000
commitfb6341e7fdb435afb232bc6468ed73ccd727bcd4 (patch)
tree8255dac0f4e2123b08686b617c3a4cdbd65b5568
parentb3abe3a5ef6bf8f6c3e7247dcd12d52da95adda9 (diff)
downloademacs-fb6341e7fdb435afb232bc6468ed73ccd727bcd4.tar.gz
emacs-fb6341e7fdb435afb232bc6468ed73ccd727bcd4.zip
(handle_one_xevent): Check that f is not NULL before
calling x_kill_gs_process.
-rw-r--r--src/xterm.c4
1 files changed, 2 insertions, 2 deletions
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)
5821 images, only, which should have 1 page. */ 5821 images, only, which should have 1 page. */
5822 Pixmap pixmap = (Pixmap) event.xclient.data.l[1]; 5822 Pixmap pixmap = (Pixmap) event.xclient.data.l[1];
5823 f = x_window_to_frame (dpyinfo, event.xclient.window); 5823 f = x_window_to_frame (dpyinfo, event.xclient.window);
5824 if (!f)
5825 goto OTHER;
5824 x_kill_gs_process (pixmap, f); 5826 x_kill_gs_process (pixmap, f);
5825 expose_frame (f, 0, 0, 0, 0); 5827 expose_frame (f, 0, 0, 0, 0);
5826 goto done; 5828 goto done;
@@ -5839,10 +5841,8 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
5839#endif /* USE_TOOLKIT_SCROLL_BARS */ 5841#endif /* USE_TOOLKIT_SCROLL_BARS */
5840 5842
5841 f = x_any_window_to_frame (dpyinfo, event.xclient.window); 5843 f = x_any_window_to_frame (dpyinfo, event.xclient.window);
5842
5843 if (!f) 5844 if (!f)
5844 goto OTHER; 5845 goto OTHER;
5845
5846 if (x_handle_dnd_message (f, &event.xclient, dpyinfo, &inev.ie)) 5846 if (x_handle_dnd_message (f, &event.xclient, dpyinfo, &inev.ie))
5847 *finish = X_EVENT_DROP; 5847 *finish = X_EVENT_DROP;
5848 } 5848 }