diff src/filelock.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 e38acbeb1cae
children 1d8fb2eee1bb
line wrap: on
line diff
--- a/src/filelock.c	Tue May 21 23:47:40 2002 +0000
+++ b/src/filelock.c	Thu May 23 11:46:46 2002 +0000
@@ -93,7 +93,7 @@
 /* Write the name of the lock file for FN into LFNAME.  Length will be
    that of FN plus two more for the leading `.#' plus one for the null.  */
 #define MAKE_LOCK_NAME(lock, file) \
-  (lock = (Intbyte *) alloca (XSTRING_LENGTH (file) + 2 + 1), \
+  (lock = (Intbyte *) ALLOCA (XSTRING_LENGTH (file) + 2 + 1), \
    fill_in_lock_file_name (lock, file))
 
 static void
@@ -138,7 +138,7 @@
     host_name = (Intbyte *) "";
 
   lock_info_str =
-    (Intbyte *) alloca (qxestrlen (user_name) + qxestrlen (host_name)
+    (Intbyte *) ALLOCA (qxestrlen (user_name) + qxestrlen (host_name)
 			+ LOCK_PID_MAX + 5);
 
   qxesprintf (lock_info_str, "%s@%s.%d", user_name, host_name, qxe_getpid ());
@@ -191,7 +191,7 @@
      read it to determine return value, so allocate it.  */
   if (!owner)
     {
-      owner = (lock_info_type *) alloca (sizeof (lock_info_type));
+      owner = (lock_info_type *) ALLOCA (sizeof (lock_info_type));
       local_owner = 1;
     }
 
@@ -346,7 +346,7 @@
     goto done;
 
   /* Else consider breaking the lock */
-  locker = (Intbyte *) alloca (qxestrlen (lock_info.user)
+  locker = (Intbyte *) ALLOCA (qxestrlen (lock_info.user)
 			       + qxestrlen (lock_info.host)
 			       + LOCK_PID_MAX + 9);
   qxesprintf (locker, "%s@%s (pid %d)", lock_info.user, lock_info.host,