Improve doprnt and its use in verror. (Bug#8545)

 src/doprnt.c (doprnt): Document the set of format control sequences
 supported by the function.  Use SAFE_ALLOCA instead of always
 using `alloca'.
 src/eval.c (verror): Don't limit the buffer size at size_max-1, that
 is one byte too soon.  Don't use xrealloc; instead xfree and
 xmalloc anew.

1 files changed, 5 insertions, 6 deletions

diff --git a/src/eval.c b/src/eval.c
index c3676720940..d1f327021e6 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2012,15 +2012,14 @@ verror (const char *m, va_list ap)
         break;
       if (size <= size_max / 2)
         size *= 2;
-      else if (size < size_max - 1)
-        size = size_max - 1;
+      else if (size < size_max)
+        size = size_max;
       else
         break;  /* and leave the message truncated */
 
-      if (buffer == buf)
-        buffer = (char *) xmalloc (size);
-      else
-        buffer = (char *) xrealloc (buffer, size);
+      if (buffer != buf)
+        xfree (buffer);
+      buffer = (char *) xmalloc (size);
     }
 
   string = make_string (buffer, used);