[Emacs-diffs] master fc05d4f: Fix segfault when calling frame_ancestor_p (Bug#26493)

[Martin Rudalics]

branch: master
commit fc05d4fec98387097c30a5c60e2f343cb797af26
Author: Martin Rudalics <address@hidden>
Commit: Martin Rudalics <address@hidden>

    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).
---
 src/xterm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xterm.c b/src/xterm.c
index 8dc1067..5169292 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),