Mercurial > emacs
changeset 56193:3310f9505840
(MAX_ALLOCA): Remove define.
(Faset): Use SAFE_ALLOCA.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Mon, 21 Jun 2004 21:54:08 +0000 |
| parents | bd23203e8ba1 |
| children | e1f0d4beb4ba |
| files | src/data.c |
| diffstat | 1 files changed, 7 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/data.c Mon Jun 21 21:53:41 2004 +0000 +++ b/src/data.c Mon Jun 21 21:54:08 2004 +0000 @@ -2052,11 +2052,6 @@ } } -/* Don't use alloca for relocating string data larger than this, lest - we overflow their stack. The value is the same as what used in - fns.c for base64 handling. */ -#define MAX_ALLOCA 16*1024 - DEFUN ("aset", Faset, Saset, 3, 3, 0, doc: /* Store into the element of ARRAY at index IDX the value NEWELT. Return NEWELT. ARRAY may be a vector, a string, a char-table or a @@ -2156,10 +2151,9 @@ /* We must relocate the string data. */ int nchars = SCHARS (array); unsigned char *str; - - str = (nbytes <= MAX_ALLOCA - ? (unsigned char *) alloca (nbytes) - : (unsigned char *) xmalloc (nbytes)); + USE_SAFE_ALLOCA; + + SAFE_ALLOCA (str, unsigned char *, nbytes); bcopy (SDATA (array), str, nbytes); allocate_string_data (XSTRING (array), nchars, nbytes + new_bytes - prev_bytes); @@ -2167,8 +2161,7 @@ p1 = SDATA (array) + idxval_byte; bcopy (str + idxval_byte + prev_bytes, p1 + new_bytes, nbytes - (idxval_byte + prev_bytes)); - if (nbytes > MAX_ALLOCA) - xfree (str); + SAFE_FREE (nbytes); clear_string_char_byte_cache (); } while (new_bytes--) @@ -2190,14 +2183,13 @@ unsigned char workbuf[MAX_MULTIBYTE_LENGTH], *p0 = workbuf, *p1; unsigned char *origstr = SDATA (array), *str; int nchars, nbytes; + USE_SAFE_ALLOCA; nchars = SCHARS (array); nbytes = idxval_byte = count_size_as_multibyte (origstr, idxval); nbytes += count_size_as_multibyte (origstr + idxval, nchars - idxval); - str = (nbytes <= MAX_ALLOCA - ? (unsigned char *) alloca (nbytes) - : (unsigned char *) xmalloc (nbytes)); + SAFE_ALLOCA (str, unsigned char *, nbytes); copy_text (SDATA (array), str, nchars, 0, 1); PARSE_MULTIBYTE_SEQ (str + idxval_byte, nbytes - idxval_byte, prev_bytes); @@ -2210,8 +2202,7 @@ *p1++ = *p0++; bcopy (str + idxval_byte + prev_bytes, p1, nbytes - (idxval_byte + prev_bytes)); - if (nbytes > MAX_ALLOCA) - xfree (str); + SAFE_FREE (nbytes); clear_string_char_byte_cache (); } }