diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-05 23:16:12 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-05 23:16:12 -0700 |
commit | d1f3d2afe1057a99b9dec6d1bd5b57bfee81fdff (patch) | |
tree | f471bdf3143b2d4ba0cf2d4c4e530304b7a67c88 /src/alloc.c | |
parent | dd52fcea063f37a9875bf9196dbe11a442e8adfc (diff) | |
download | emacs-d1f3d2afe1057a99b9dec6d1bd5b57bfee81fdff.tar.gz emacs-d1f3d2afe1057a99b9dec6d1bd5b57bfee81fdff.tar.bz2 emacs-d1f3d2afe1057a99b9dec6d1bd5b57bfee81fdff.zip |
Check for buffer and string overflow more precisely.
* buffer.h (BUF_BYTES_MAX): New macro.
* lisp.h (STRING_BYTES_MAX): New macro.
* alloc.c (Fmake_string):
* character.c (string_escape_byte8):
* coding.c (coding_alloc_by_realloc):
* doprnt.c (doprnt):
* editfns.c (Fformat):
* eval.c (verror):
Use STRING_BYTES_MAX, not MOST_POSITIVE_FIXNUM,
since they may not be the same number.
* editfns.c (Finsert_char):
* fileio.c (Finsert_file_contents):
Likewise for BUF_BYTES_MAX.
Diffstat (limited to 'src/alloc.c')
-rw-r--r-- | src/alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/alloc.c b/src/alloc.c index 8d0fdd125dc..d9e00c3aeb4 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -2211,7 +2211,7 @@ INIT must be an integer that represents a character. */) int len = CHAR_STRING (c, str); EMACS_INT string_len = XINT (length); - if (string_len > MOST_POSITIVE_FIXNUM / len) + if (string_len > STRING_BYTES_MAX / len) string_overflow (); nbytes = len * string_len; val = make_uninit_multibyte_string (string_len, nbytes); |