A paranoia check, merged from gnulib.

diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index b14eb194d72e43f7559459269b36e8d4b7fdb5d4..78c7b596cfa8f7959bb79328bcd751699b0fd1d7 100644 (file)
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-30  Paul Eggert  <eggert@twinsun.com>
+            Bruno Haible  <bruno@clisp.org>
+
+       * vasprintf.c: Include <limits.h>, <stdlib.h>.
+       (vasprintf): Fail if the resulting length doesn't fit in an 'int'.
+
 2003-12-12  Bruno Haible  <bruno@clisp.org>
 
        Assume automake-1.8.

diff --git a/gettext-runtime/libasprintf/vasprintf.c b/gettext-runtime/libasprintf/vasprintf.c
index 925d2fb81869fad156ee733851e15089e66278b9..d20f8ca6319bcbec2b2090409db72faf91193b3a 100644 (file)
--- a/gettext-runtime/libasprintf/vasprintf.c
+++ b/gettext-runtime/libasprintf/vasprintf.c
@@ -23,6 +23,9 @@
 /* Specification.  */
 #include "vasprintf.h"
 
+#include <limits.h>
+#include <stdlib.h>
+
 #include "vasnprintf.h"
 
 int
@@ -32,6 +35,14 @@ vasprintf (char **resultp, const char *format, va_list args)
   char *result = vasnprintf (NULL, &length, format, args);
   if (result == NULL)
     return -1;
+  if (length > INT_MAX)
+    {
+      /* We could produce such a big string, but can't return its length
+        as an 'int'.  */
+      free (result);
+      return -1;
+    }
+
   *resultp = result;
   /* Return the number of resulting bytes, excluding the trailing NUL.  */
   return length;