diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2017-04-14 12:14:09 +0200 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2017-04-14 12:14:09 +0200 |
| commit | fc05d4fec98387097c30a5c60e2f343cb797af26 (patch) | |
| tree | 17f145008f7a88a3ebc2e6532c7484e7fcdaaa27 /src/xterm.c | |
| parent | 96644ed496cfc36ef886c401250203c57d77ab75 (diff) | |
| download | emacs-fc05d4fec98387097c30a5c60e2f343cb797af26.tar.gz | |
Fix segfault when calling frame_ancestor_p (Bug#26493)
* src/xterm.c (handle_one_xevent): Check that hf was not reset
before calling frame_ancestor_p (Bug#26493).
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xterm.c b/src/xterm.c index 8dc1067a688..51692921708 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -8801,7 +8801,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, frame. */ struct frame *hf = dpyinfo->x_highlight_frame; - if (FRAME_PARENT_FRAME (f) || frame_ancestor_p (f, hf)) + if (FRAME_PARENT_FRAME (f) || (hf && frame_ancestor_p (f, hf))) { block_input (); XSetInputFocus (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), |