Fix crash when printing large 64-bit values on Win32 using the %I64x

2006-08-20  Tor Lillqvist  <tml@novell.com>

	* glib/gnulib/vasnprintf.c (vasnprintf): Fix crash when printing
	large 64-bit values on Win32 using the %I64x format. (#351034,
	Neil Piercy)

diff --git a/ChangeLog b/ChangeLog
index cdd1195..4259a13 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-20  Tor Lillqvist  <tml@novell.com>
+
+       * glib/gnulib/vasnprintf.c (vasnprintf): Fix crash when printing
+       large 64-bit values on Win32 using the %I64x format. (#351034,
+       Neil Piercy)
+
 Wed Aug 16 13:59:07 2006  Tim Janik  <timj@gtk.org>
 
        * tests/gobject/Makefile.am:

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index cdd1195..4259a13 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2006-08-20  Tor Lillqvist  <tml@novell.com>
+
+       * glib/gnulib/vasnprintf.c (vasnprintf): Fix crash when printing
+       large 64-bit values on Win32 using the %I64x format. (#351034,
+       Neil Piercy)
+
 Wed Aug 16 13:59:07 2006  Tim Janik  <timj@gtk.org>
 
        * tests/gobject/Makefile.am:

diff --git a/glib/gnulib/vasnprintf.c b/glib/gnulib/vasnprintf.c
index 1b46800..e279fc0 100644 (file)
--- a/glib/gnulib/vasnprintf.c
+++ b/glib/gnulib/vasnprintf.c
@@ -480,6 +480,16 @@ vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
                          + 2; /* account for leading sign or alternate form */
                      else
 # endif
+# ifdef HAVE_INT64_AND_I64
+                     if (type == TYPE_INT64 || type == TYPE_UINT64)
+                       tmp_length =
+                         (unsigned int) (sizeof (unsigned __int64) * CHAR_BIT
+                                         * 0.25 /* binary -> hexadecimal */
+                                         )
+                         + 1 /* turn floor into ceil */
+                         + 2; /* account for leading sign or alternate form */
+                     else
+# endif
                      if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
                        tmp_length =
                          (unsigned int) (sizeof (unsigned long) * CHAR_BIT