From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 2 Sep 1994 20:17:12 +0000 (+0000)
Subject: (display_text_line): Don't overrun the charstart area.
X-Git-Tag: emacs-19.34~7170
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=125138e22420a1233a7479a612634083d219c113;p=emacs.git

(display_text_line): Don't overrun the charstart area.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index c67eeea232a..4369f5154be 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2309,7 +2309,7 @@ display_text_line (w, start, vpos, hpos, taboffset)
 	  if (p1 != p1prev)
 	    {
 	      int *p2x = &charstart[p1prev - p1start];
-	      int *p2 = &charstart[p1 - p1start];
+	      int *p2 = &charstart[(p1 < endp ? p1 : endp) - p1start];
 
 	      /* The window's left column should always
 		 contain a character position.