(note_mouse_highlight): Reject out-of-range pos value

before it causes an error.

1 files changed, 7 insertions, 1 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 13ebd31e83e..5d22c27ae1e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1970,10 +1970,16 @@ note_mouse_highlight (f, x, y)
           Lisp_Object mouse_face, overlay, position;
           Lisp_Object *overlay_vec;
           int len, noverlays, ignor1;
+          struct buffer *obuf;
+
+          /* If we get an out-of-range value, return now;
+             don't get an error.  */
+          if (pos > BUF_ZV (XBUFFER (w->buffer)))
+            return;
 
           /* Make the window's buffer temporarily current for
              overlays_at and compute_char_face.  */
-          struct buffer *obuf = current_buffer;
+          obuf = current_buffer;
           current_buffer = XBUFFER (w->buffer);
 
           /* Yes.  Clear the display of the old active region, if any.  */