(notice_overwritten_cursor): Check that phys_cursor.vpos

is valid. If not, clear phys_cursor_on_p and return.

(notice_overwritten_cursor): Check that phys_cursor.vpos
is valid. If not, clear phys_cursor_on_p and return.
2e87e8f2 · Kim F. Storm · f30c4a5c · 2e87e8f2
Commit 2e87e8f2 authored Mar 07, 2005 by Kim F. Storm
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

src/xdisp.c src/xdisp.c +8 -3

No files found.
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -20201,9 +20201,14 @@ notice_overwritten_cursor (w, area, x0, x1, y0, y1)
  if (area != TEXT_AREA)
    return;
  
-  row = w->current_matrix->rows + w->phys_cursor.vpos;
-  if (!row->displays_text_p)
-    return;
+  if (w->phys_cursor.vpos < 0
+      || w->phys_cursor.vpos >= w->current_matrix->nrows
+      || (row = w->current_matrix->rows + w->phys_cursor.vpos,
+	  !(row->enabled_p && row->displays_text_p)))
+    {
+      w->phys_cursor_on_p = 0;
+      return;
+    }
  
  if (row->cursor_in_fringe_p)
    {