changeset 60252:825c64cf8e7c

(init_from_display_pos): Don't read past end of it->overlay_strings array.
author Kim F. Storm <storm@cua.dk>
date Fri, 25 Feb 2005 21:50:21 +0000
parents b22562d329a7
children 6452fdddef8f
files src/xdisp.c
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/xdisp.c	Fri Feb 25 21:49:59 2005 +0000
+++ b/src/xdisp.c	Fri Feb 25 21:50:21 2005 +0000
@@ -2538,7 +2538,10 @@
      after-string.  */
   init_iterator (it, w, charpos, bytepos, NULL, DEFAULT_FACE_ID);
 
-  for (i = 0; i < it->n_overlay_strings; ++i)
+  /* This only scans the current chunk -- it should scan all chunks.
+     However, OVERLAY_STRING_CHUNK_SIZE has been increased from 3 in 21.1
+     to 16 in 22.1 to make this a lesser problem.  */
+  for (i = 0; i < it->n_overlay_strings && i < OVERLAY_STRING_CHUNK_SIZE; ++i)
     {
       const char *s = SDATA (it->overlay_strings[i]);
       const char *e = s + SBYTES (it->overlay_strings[i]);