Mercurial > hg > xemacs-beta
diff src/emodules.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 | 14089a93af0a |
| children | 2b6fa2618f76 |
line wrap: on
line diff
--- a/src/emodules.c Tue May 21 23:47:40 2002 +0000 +++ b/src/emodules.c Thu May 23 11:46:46 2002 +0000 @@ -333,7 +333,7 @@ /* This is to get around the fact that build_string() is not declared as taking a const char * as an argument. I HATE compiler warnings. */ - tmod = (char *)alloca (strlen (module) + 1); + tmod = (char *)ALLOCA (strlen (module) + 1); strcpy (tmod, module); GCPRO2(filename, foundname); @@ -345,7 +345,7 @@ if (fd < 0) signal_error (Qdll_error, "Cannot open dynamic module", filename); - soname = (char *)alloca (XSTRING_LENGTH (foundname) + 1); + soname = (char *)ALLOCA (XSTRING_LENGTH (foundname) + 1); strcpy (soname, (char *)XSTRING_DATA (foundname)); dlhandle = dll_open (soname); @@ -368,7 +368,7 @@ if ((f == (const char **)0) || (*f == (const char *)0)) signal_error (Qdll_error, "Invalid dynamic module: Missing symbol `emodule_name'", Qunbound); - mname = (char *)alloca (strlen (*f) + 1); + mname = (char *)ALLOCA (strlen (*f) + 1); strcpy (mname, *f); if (mname[0] == '\0') signal_error (Qdll_error, "Invalid dynamic module: Empty value for `emodule_name'", Qunbound); @@ -377,17 +377,17 @@ if ((f == (const char **)0) || (*f == (const char *)0)) signal_error (Qdll_error, "Missing symbol `emodule_version': Invalid dynamic module", Qunbound); - mver = (char *)alloca (strlen (*f) + 1); + mver = (char *)ALLOCA (strlen (*f) + 1); strcpy (mver, *f); f = (const char **)dll_variable (dlhandle, "emodule_title"); if ((f == (const char **)0) || (*f == (const char *)0)) signal_error (Qdll_error, "Invalid dynamic module: Missing symbol `emodule_title'", Qunbound); - mtitle = (char *)alloca (strlen (*f) + 1); + mtitle = (char *)ALLOCA (strlen (*f) + 1); strcpy (mtitle, *f); - symname = (char *)alloca (strlen (mname) + 15); + symname = (char *)ALLOCA (strlen (mname) + 15); strcpy (symname, "modules_of_"); strcat (symname, mname);