comparison src/search.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 5d09ddada9ae
children 2b6fa2618f76
comparison
equal deleted inserted replaced
850:f915ad7befaf 851:e7ee5f8bde58
1981 1981
1982 { 1982 {
1983 /* The following value is an upper bound on the amount of storage we 1983 /* The following value is an upper bound on the amount of storage we
1984 need. In non-Mule, it is exact. */ 1984 need. In non-Mule, it is exact. */
1985 Intbyte *storage = 1985 Intbyte *storage =
1986 (Intbyte *) alloca (XSTRING_LENGTH (string) - punct_count + 1986 (Intbyte *) ALLOCA (XSTRING_LENGTH (string) - punct_count +
1987 5 * (word_count - 1) + 4); 1987 5 * (word_count - 1) + 4);
1988 Intbyte *o = storage; 1988 Intbyte *o = storage;
1989 1989
1990 *o++ = '\\'; 1990 *o++ = '\\';
1991 *o++ = 'b'; 1991 *o++ = 'b';
2966 REGISTER Intbyte *in, *out, *end; 2966 REGISTER Intbyte *in, *out, *end;
2967 REGISTER Intbyte *temp; 2967 REGISTER Intbyte *temp;
2968 2968
2969 CHECK_STRING (string); 2969 CHECK_STRING (string);
2970 2970
2971 temp = (Intbyte *) alloca (XSTRING_LENGTH (string) * 2); 2971 temp = (Intbyte *) ALLOCA (XSTRING_LENGTH (string) * 2);
2972 2972
2973 /* Now copy the data into the new string, inserting escapes. */ 2973 /* Now copy the data into the new string, inserting escapes. */
2974 2974
2975 in = XSTRING_DATA (string); 2975 in = XSTRING_DATA (string);
2976 end = in + XSTRING_LENGTH (string); 2976 end = in + XSTRING_LENGTH (string);