diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-28 13:09:37 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-28 13:09:37 -0700 |
| commit | f76dee0c23a846517e72618dec6d2424321bb32b (patch) | |
| tree | d2092b8f0034d276c1212fa848234772ea0806a0 /src/doprnt.c | |
| parent | fdc5744d4f448c2250d798b0c271910cd6254f2d (diff) | |
| download | emacs-f76dee0c23a846517e72618dec6d2424321bb32b.tar.gz emacs-f76dee0c23a846517e72618dec6d2424321bb32b.tar.bz2 emacs-f76dee0c23a846517e72618dec6d2424321bb32b.zip | |
* doprnt.c (doprnt): Omit useless test; int overflow check (Bug#8545).
Diffstat (limited to 'src/doprnt.c')
| -rw-r--r-- | src/doprnt.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/doprnt.c b/src/doprnt.c index 63dba9f5850..eac1796c496 100644 --- a/src/doprnt.c +++ b/src/doprnt.c @@ -198,8 +198,12 @@ doprnt (char *buffer, register size_t bufsize, const char *format, while (fmt < format_end && '0' <= fmt[1] && fmt[1] <= '9') { - if (n >= SIZE_MAX / 10 - || n * 10 > SIZE_MAX - (fmt[1] - '0')) + /* Avoid int overflow, because many sprintfs seriously + mess up with widths or precisions greater than + INT_MAX. Avoid size_t overflow, since our counters + use size_t. This test is slightly conservative, for + speed and simplicity. */ + if (n >= min (INT_MAX, SIZE_MAX) / 10) error ("Format width or precision too large"); n = n * 10 + fmt[1] - '0'; *string++ = *++fmt; |