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/doprnt.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/doprnt.c')
| -rw-r--r-- | src/doprnt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/doprnt.c b/src/doprnt.c index d2abc119912..5ca3ea89be6 100644 --- a/src/doprnt.c +++ b/src/doprnt.c @@ -329,7 +329,7 @@ doprnt (char *buffer, register size_t bufsize, const char *format, minlen = atoi (&fmtcpy[1]); string = va_arg (ap, char *); tem = strlen (string); - if (tem > MOST_POSITIVE_FIXNUM) + if (tem > STRING_BYTES_MAX) error ("String for %%s or %%S format is too long"); width = strwidth (string, tem); goto doit1; @@ -338,7 +338,7 @@ doprnt (char *buffer, register size_t bufsize, const char *format, doit: /* Coming here means STRING contains ASCII only. */ tem = strlen (string); - if (tem > MOST_POSITIVE_FIXNUM) + if (tem > STRING_BYTES_MAX) error ("Format width or precision too large"); width = tem; doit1: |