Avoid crashes when setting the cursor

* src/xdisp.c (display_and_set_cursor): Don't index glyphs of a
glyph row if hpos is out of valid bounds.  This avoids crashes in
some rare cases.  (Bug#24614)

diff --git a/src/xdisp.c b/src/xdisp.c
index adbb6e5088bd85b1dc601bc178c06de5b84aa071..42c6fb75efa0613f78e2f34f7f281bb3ecfceda4 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -28486,8 +28486,7 @@ display_and_set_cursor (struct window *w, bool on,
     }
 
   glyph = NULL;
-  if (!glyph_row->exact_window_width_line_p
-      || (0 <= hpos && hpos < glyph_row->used[TEXT_AREA]))
+  if (0 <= hpos && hpos < glyph_row->used[TEXT_AREA])
     glyph = glyph_row->glyphs[TEXT_AREA] + hpos;
 
   eassert (input_blocked_p ());