Avoid address wraparound inside system functions.

diff --git a/ChangeLog b/ChangeLog
index d84ab353747e32e8cf3e904161dfa5b6667b6bf6..dc954fb675071394d72ca4740a3d33224650b00a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-07-01  Bruno Haible  <bruno@clisp.org>
+
+       * lib/sprintf.c (sprintf): Limit the available length estimation,
+       to avoid address wraparound.
+       * lib/vsprintf.c (vsprintf): Likewise.
+       * modules/sprintf-posix (Dependencies): Add stdint.
+       * modules/vsprintf-posix (Dependencies): Likewise.
+
 2007-07-01  Bruno Haible <bruno@clisp.org>
 
        * gnulib-tool (self_abspathname): Determine PATH_SEPARATOR and handle

diff --git a/lib/sprintf.c b/lib/sprintf.c
index ab14107da6f14c32780a7dd571eb14c73b16b2d3..035fe21379407e1b72cb4b7bd4f1f8bfc82c6d9e 100644 (file)
--- a/lib/sprintf.c
+++ b/lib/sprintf.c
@@ -25,6 +25,7 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <stdlib.h>
 
 #include "vasnprintf.h"
@@ -46,11 +47,19 @@ sprintf (char *str, const char *format, ...)
 {
   char *output;
   size_t len;
-  /* vasnprintf fails with EOVERFLOW when the buffer size argument is larger
-     than INT_MAX (if that fits into a 'size_t' at all).  */
-  size_t lenbuf = (SIZE_MAX < INT_MAX ? SIZE_MAX : INT_MAX);
+  size_t lenbuf;
   va_list args;
 
+  /* vasnprintf fails with EOVERFLOW when the buffer size argument is larger
+     than INT_MAX (if that fits into a 'size_t' at all).
+     Also note that glibc's iconv fails with E2BIG when we pass a length that
+     is so large that str + lenbuf wraps around, i.e.
+     (uintptr_t) (str + lenbuf) < (uintptr_t) str.
+     Therefore set lenbuf = min (SIZE_MAX, INT_MAX, - (uintptr_t) str - 1).  */
+  lenbuf = (SIZE_MAX < INT_MAX ? SIZE_MAX : INT_MAX);
+  if (lenbuf > ~ (uintptr_t) str)
+    lenbuf = ~ (uintptr_t) str;
+
   va_start (args, format);
   output = vasnprintf (str, &lenbuf, format, args);
   len = lenbuf;

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index a9d840d9c885547bcc76ea4594db562955520b68..88e528db3784f007ce0fe1beb19bbe1c89cfd89a 100644 (file)
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -25,6 +25,7 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <stdlib.h>
 
 #include "vasnprintf.h"
@@ -46,9 +47,17 @@ vsprintf (char *str, const char *format, va_list args)
 {
   char *output;
   size_t len;
+  size_t lenbuf;
+
   /* vasnprintf fails with EOVERFLOW when the buffer size argument is larger
-     than INT_MAX (if that fits into a 'size_t' at all).  */
-  size_t lenbuf = (SIZE_MAX < INT_MAX ? SIZE_MAX : INT_MAX);
+     than INT_MAX (if that fits into a 'size_t' at all).
+     Also note that glibc's iconv fails with E2BIG when we pass a length that
+     is so large that str + lenbuf wraps around, i.e.
+     (uintptr_t) (str + lenbuf) < (uintptr_t) str.
+     Therefore set lenbuf = min (SIZE_MAX, INT_MAX, - (uintptr_t) str - 1).  */
+  lenbuf = (SIZE_MAX < INT_MAX ? SIZE_MAX : INT_MAX);
+  if (lenbuf > ~ (uintptr_t) str)
+    lenbuf = ~ (uintptr_t) str;
 
   output = vasnprintf (str, &lenbuf, format, args);
   len = lenbuf;

diff --git a/modules/sprintf-posix b/modules/sprintf-posix
index 7bfa94b23e711a1856d791112777e637b04e442a..0ae1ef443663c6cb85eb28569c646b2cd24d3d04 100644 (file)
--- a/modules/sprintf-posix
+++ b/modules/sprintf-posix
@@ -17,6 +17,7 @@ printf-frexpl
 signbit
 fpucw
 printf-safe
+stdint
 
 configure.ac:
 gl_FUNC_SPRINTF_POSIX

diff --git a/modules/vsprintf-posix b/modules/vsprintf-posix
index ba79781a26ab9bcc840d8c0433c64bcc3648f23b..d96745cfc65d3c862987deee6150861c53a5585b 100644 (file)
--- a/modules/vsprintf-posix
+++ b/modules/vsprintf-posix
@@ -17,6 +17,7 @@ printf-frexpl
 signbit
 fpucw
 printf-safe
+stdint
 
 configure.ac:
 gl_FUNC_VSPRINTF_POSIX