Mercurial > hg > xemacs-beta
comparison src/select-msw.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 | a5954632b187 |
children | 79c6ff3eef26 |
comparison
equal
deleted
inserted
replaced
850:f915ad7befaf | 851:e7ee5f8bde58 |
---|---|
312 size = XOPAQUE_SIZE (data); | 312 size = XOPAQUE_SIZE (data); |
313 } | 313 } |
314 else | 314 else |
315 /* we do NOT append a zero byte. we don't know whether we're dealing | 315 /* we do NOT append a zero byte. we don't know whether we're dealing |
316 with regular text, unicode text, binary data, etc. */ | 316 with regular text, unicode text, binary data, etc. */ |
317 TO_EXTERNAL_FORMAT (LISP_STRING, data, ALLOCA, (src, size), | 317 TO_EXTERNAL_FORMAT (LISP_STRING, data, MALLOC, (src, size), |
318 Qbinary); | 318 Qbinary); |
319 | 319 |
320 /* Allocate memory */ | 320 /* Allocate memory */ |
321 hValue = GlobalAlloc (GMEM_DDESHARE | GMEM_MOVEABLE, size); | 321 hValue = GlobalAlloc (GMEM_DDESHARE | GMEM_MOVEABLE, size); |
322 | 322 |
323 if (!hValue) | 323 if (!hValue) |
324 { | 324 { |
325 CloseClipboard (); | 325 CloseClipboard (); |
326 | 326 |
327 xfree (src); | |
327 return Qnil; | 328 return Qnil; |
328 } | 329 } |
329 | 330 |
330 dst = GlobalLock (hValue); | 331 dst = GlobalLock (hValue); |
331 | 332 |
332 if (!dst) | 333 if (!dst) |
333 { | 334 { |
334 GlobalFree (hValue); | 335 GlobalFree (hValue); |
335 CloseClipboard (); | 336 CloseClipboard (); |
336 | 337 |
338 xfree (src); | |
337 return Qnil; | 339 return Qnil; |
338 } | 340 } |
339 | 341 |
340 memcpy (dst, src, size); | 342 memcpy (dst, src, size); |
343 xfree (src); | |
341 | 344 |
342 GlobalUnlock (hValue); | 345 GlobalUnlock (hValue); |
343 | 346 |
344 /* Empty the clipboard if we're replacing everything */ | 347 /* Empty the clipboard if we're replacing everything */ |
345 if (NILP (how_to_add) || EQ (how_to_add, Qreplace_all)) | 348 if (NILP (how_to_add) || EQ (how_to_add, Qreplace_all)) |