From 85b0587a93bdb80c4c304a39cb5ffd3600c95a16 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 9 Nov 2022 16:25:02 +0200 Subject: [PATCH] Avoid assertion violations in matrix_row * src/xdisp.c (cursor_in_mouse_face_p): Avoid rare assertion violations when the cursor's VPOS winds up being invalid for the window. (Bug#59147) --- src/xdisp.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/xdisp.c b/src/xdisp.c index 95da704a070..f6a279636a0 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -33564,8 +33564,14 @@ coords_in_mouse_face_p (struct window *w, int hpos, int vpos) bool cursor_in_mouse_face_p (struct window *w) { - int hpos = w->phys_cursor.hpos; int vpos = w->phys_cursor.vpos; + + /* If the cursor is outside the matrix glyph rows, it cannot be + within the mouse face. */ + if (!(0 <= vpos && vpos < w->current_matrix->nrows)) + return false; + + int hpos = w->phys_cursor.hpos; struct glyph_row *row = MATRIX_ROW (w->current_matrix, vpos); /* When the window is hscrolled, cursor hpos can legitimately be out -- 2.39.5