diff options
author | Paul Eggert <[email protected]> | 2011-05-30 09:47:35 -0700 |
---|---|---|
committer | Paul Eggert <[email protected]> | 2011-05-30 09:47:35 -0700 |
commit | 531b01656f89e093b9fa35959fa41e534b025320 (patch) | |
tree | 190b5a279e0e8e0130b6ba070fa217ce1282e2f3 /src/buffer.c | |
parent | de677ace77fa48962be80b668662a7009498e5d6 (diff) |
[ChangeLog]
Malloc failure behavior now depends on size of allocation.
* lib/allocator.h (struct allocator.die): New size arg.
* lib/careadlinkat.c (careadlinkat): Pass size to 'die' function.
If the actual problem is an ssize_t limitation, not a size_t or
malloc failure, fail with errno == ENAMETOOLONG instead of calling 'die'.
[src/ChangeLog]
Malloc failure behavior now depends on size of allocation.
* alloc.c (buffer_memory_full, memory_full): New arg NBYTES.
* lisp.h: Change signatures accordingly.
* alloc.c, buffer.c, editfns.c, menu.c, minibuf.c, xterm.c:
All callers changed.
Diffstat (limited to 'src/buffer.c')
-rw-r--r-- | src/buffer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/buffer.c b/src/buffer.c index 05bd129976..e9ff8f492b 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -328,7 +328,7 @@ even if it is dead. The return value is never nil. */) alloc_buffer_text (b, BUF_GAP_SIZE (b) + 1); UNBLOCK_INPUT; if (! BUF_BEG_ADDR (b)) - buffer_memory_full (); + buffer_memory_full (BUF_GAP_SIZE (b) + 1); b->pt = BEG; b->begv = BEG; @@ -4892,7 +4892,7 @@ alloc_buffer_text (struct buffer *b, size_t nbytes) if (p == NULL) { UNBLOCK_INPUT; - memory_full (); + memory_full (nbytes); } b->text->beg = (unsigned char *) p; @@ -4920,7 +4920,7 @@ enlarge_buffer_text (struct buffer *b, EMACS_INT delta) if (p == NULL) { UNBLOCK_INPUT; - memory_full (); + memory_full (nbytes); } BUF_BEG_ADDR (b) = (unsigned char *) p; |