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 @@
 2011-05-04  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * eval.c (verror): OK to create a string of up to MOST_POSITIVE_FIXNUM
+        bytes.
+
         * term.c: Don't include <stdarg.h>, as <lisp.h> does that.
 
         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)
 {
   char buf[4000];
   size_t size = sizeof buf;
-  size_t size_max = min (MOST_POSITIVE_FIXNUM, SIZE_MAX);
+  size_t size_max = min (MOST_POSITIVE_FIXNUM + 1, SIZE_MAX);
   size_t mlen = strlen (m);
   char *buffer = buf;
   size_t used;