diff src/redisplay.c @ 851:e7ee5f8bde58

[xemacs-hg @ 2002-05-23 11:46:08 by ben] fix for raymond toy's crash, alloca crashes, some recover-session improvements files.el: Recover-session improvements: Only show session files where some files can actually be recovered, and show in chronological order. subr.el, menubar-items.el: As promised to rms, the functionality in truncate-string-with-continuation-dots has been merged into truncate-string-to-width. Change callers in menubar-items.el. select.el: Document some of these funs better. Fix problem where we were doing own-clipboard twice. Makefile.in.in: Add alloca.o. Ensure that alloca.s doesn't compile into alloca.o, but allocax.o (not that it's currently used or anything.) EmacsFrame.c, abbrev.c, alloc.c, alloca.c, callint.c, callproc.c, config.h.in, device-msw.c, device-x.c, dired.c, doc.c, editfns.c, emacs.c, emodules.c, eval.c, event-Xt.c, event-msw.c, event-stream.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-x.c, input-method-xlib.c, intl-win32.c, lisp.h, lread.c, menubar-gtk.c, menubar-msw.c, menubar.c, mule-wnnfns.c, nt.c, objects-msw.c, process-nt.c, realpath.c, redisplay-gtk.c, redisplay-output.c, redisplay-x.c, redisplay.c, search.c, select-msw.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: Fix Raymond Toy's crash. Repeat to self: 2^21 - 1 is NOT the same as (2 << 21) - 1. Fix crashes due to excessive alloca(). replace alloca() with ALLOCA(), which calls the C alloca() [which uses xmalloc()] when the size is too big. Insert in various places calls to try to flush the C alloca() stored info if there is any. Add MALLOC_OR_ALLOCA(), for places that expect to be alloca()ing large blocks. This xmalloc()s when too large and records an unwind-protect to free -- relying on the caller to unbind_to() elsewhere in the function. Use it in concat(). Use MALLOC instead of ALLOCA in select-msw.c. xemacs.mak: Add alloca.o.
author ben
date Thu, 23 May 2002 11:46:46 +0000
parents 6728e641994e
children 2b6fa2618f76
line wrap: on
line diff
--- a/src/redisplay.c	Tue May 21 23:47:40 2002 +0000
+++ b/src/redisplay.c	Thu May 23 11:46:46 2002 +0000
@@ -5235,10 +5235,12 @@
       struct display_line *dlp;
       Charcount next_pos;
       int local;
+      int pos_of_dlp = -1;
 
       if (Dynarr_length (dla) < Dynarr_largest (dla))
 	{
-	  dlp = Dynarr_atp (dla, Dynarr_length (dla));
+	  pos_of_dlp = Dynarr_length (dla);
+	  dlp = Dynarr_atp (dla, pos_of_dlp);
 	  local = 0;
 	}
       else
@@ -5281,6 +5283,7 @@
       else
 	dlp->clip = 0;
 
+      assert (pos_of_dlp < 0 || pos_of_dlp == Dynarr_length (dla));
       Dynarr_add (dla, *dlp);
 
       /* #### This type of check needs to be done down in the
@@ -5380,10 +5383,12 @@
       struct display_line dl;
       struct display_line *dlp;
       int local;
+      int pos_of_dlp = -1;
 
       if (Dynarr_length (dla) < Dynarr_largest (dla))
 	{
-	  dlp = Dynarr_atp (dla, Dynarr_length (dla));
+	  pos_of_dlp = Dynarr_length (dla);
+	  dlp = Dynarr_atp (dla, pos_of_dlp);
 	  local = 0;
 	}
       else
@@ -5463,6 +5468,7 @@
       if (dlp->num_chars > w->max_line_len)
 	w->max_line_len = dlp->num_chars;
 
+      assert (pos_of_dlp < 0 || pos_of_dlp == Dynarr_length (dla));
       Dynarr_add (dla, *dlp);
 
       /* #### This isn't right, but it is close enough for now. */