Fix inefficiency introduced on 2007-11-03.

diff --git a/ChangeLog b/ChangeLog
index ff7b1d044109a43e18e0f72e0203405517c4b919..727651c8867c33cdf23740349adae8b1f8a3f918 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-09  Bruno Haible  <bruno@clisp.org>
+
+       * lib/vasnprintf.c (VASNPRINTF): Increase reallocation of snprintf
+       buffer. Fixes an inefficiency introduced on 2007-11-03.
+
 2007-11-09  Bruno Haible  <bruno@clisp.org>
 
        * m4/locale-tr.m4 (gt_LOCALE_TR_UTF8) [BeOS]: Make this test return

diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index b7b58dfc5a4a76ca8c8a5906f3133b33b81ce8f7..ccc531b57be9a2428645d6e396207eeb95b4eac4 100644 (file)
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -4294,13 +4294,19 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                          goto overflow;
                        else
                          {
-                           /* Need at least count * sizeof (TCHAR_T) bytes.
-                              But allocate proportionally, to avoid looping
+                           /* Need at least (count + 1) * sizeof (TCHAR_T)
+                              bytes.  (The +1 is for the trailing NUL.)
+                              But ask for (count + 2) * sizeof (TCHAR_T)
+                              bytes, so that in the next round, we likely get
+                                maxlen > (unsigned int) count + 1
+                              and so we don't get here again.
+                              And allocate proportionally, to avoid looping
                               eternally if snprintf() reports a too small
                               count.  */
                            size_t n =
                              xmax (xsum (length,
-                                         (count + TCHARS_PER_DCHAR - 1)
+                                         ((unsigned int) count + 2
+                                          + TCHARS_PER_DCHAR - 1)
                                          / TCHARS_PER_DCHAR),
                                    xtimes (allocated, 2));