aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-05-03 23:24:29 -0700
committerPaul Eggert2011-05-03 23:24:29 -0700
commit288b08c747644d42c1636c2b469f8c34836ccd35 (patch)
treea9dd957bf752b0031f75365a64105ca6e4ba3dac /src
parente3601888f128801233a35cbff7031d9a58931d20 (diff)
downloademacs-288b08c747644d42c1636c2b469f8c34836ccd35.tar.gz
emacs-288b08c747644d42c1636c2b469f8c34836ccd35.zip
* eval.c (verror): OK to create a string of up to MOST_POSITIVE_FIXNUM
bytes.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/eval.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 87876ac9b8b..9fac265ae48 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12011-05-04 Paul Eggert <eggert@cs.ucla.edu> 12011-05-04 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * eval.c (verror): OK to create a string of up to MOST_POSITIVE_FIXNUM
4 bytes.
5
3 * term.c: Don't include <stdarg.h>, as <lisp.h> does that. 6 * term.c: Don't include <stdarg.h>, as <lisp.h> does that.
4 7
5 Arithmetic overflows now return float rather than wrapping around. 8 Arithmetic overflows now return float rather than wrapping around.
diff --git a/src/eval.c b/src/eval.c
index 0187cf96705..90ef02ef37b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1994,7 +1994,7 @@ verror (const char *m, va_list ap)
1994{ 1994{
1995 char buf[4000]; 1995 char buf[4000];
1996 size_t size = sizeof buf; 1996 size_t size = sizeof buf;
1997 size_t size_max = min (MOST_POSITIVE_FIXNUM, SIZE_MAX); 1997 size_t size_max = min (MOST_POSITIVE_FIXNUM + 1, SIZE_MAX);
1998 size_t mlen = strlen (m); 1998 size_t mlen = strlen (m);
1999 char *buffer = buf; 1999 char *buffer = buf;
2000 size_t used; 2000 size_t used;