diff options
| author | Paul Eggert | 2011-06-05 23:16:12 -0700 |
|---|---|---|
| committer | Paul Eggert | 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.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, | |||
| 329 | minlen = atoi (&fmtcpy[1]); | 329 | minlen = atoi (&fmtcpy[1]); |
| 330 | string = va_arg (ap, char *); | 330 | string = va_arg (ap, char *); |
| 331 | tem = strlen (string); | 331 | tem = strlen (string); |
| 332 | if (tem > MOST_POSITIVE_FIXNUM) | 332 | if (tem > STRING_BYTES_MAX) |
| 333 | error ("String for %%s or %%S format is too long"); | 333 | error ("String for %%s or %%S format is too long"); |
| 334 | width = strwidth (string, tem); | 334 | width = strwidth (string, tem); |
| 335 | goto doit1; | 335 | goto doit1; |
| @@ -338,7 +338,7 @@ doprnt (char *buffer, register size_t bufsize, const char *format, | |||
| 338 | doit: | 338 | doit: |
| 339 | /* Coming here means STRING contains ASCII only. */ | 339 | /* Coming here means STRING contains ASCII only. */ |
| 340 | tem = strlen (string); | 340 | tem = strlen (string); |
| 341 | if (tem > MOST_POSITIVE_FIXNUM) | 341 | if (tem > STRING_BYTES_MAX) |
| 342 | error ("Format width or precision too large"); | 342 | error ("Format width or precision too large"); |
| 343 | width = tem; | 343 | width = tem; |
| 344 | doit1: | 344 | doit1: |