return 1 more for the trailing \0 when using vsnprintf. (#69474)

2002-01-23  Laszlo Peter  <laca@ireland.sun.com>

	* glib/gmessages.c (g_printf_string_upper_bound): return 1 more
        for the trailing \0 when using vsnprintf. (#69474)

diff --git a/ChangeLog b/ChangeLog
index 4d7b946cbc692f733f4a9ca7235acd6d55e63d40..5ee3412a448b5ba03f48490349863b7a29d5de4f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-23  Laszlo Peter  <laca@ireland.sun.com>
+
+       * glib/gmessages.c (g_printf_string_upper_bound): return 1 more
+       for the trailing '\0' when using vsnprintf. (#69474)
+
 2002-01-23  Tor Lillqvist  <tml@iki.fi>
 
        * glib/gconvert.c: (strdup_len): Not used on Windows, don't even

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 4d7b946cbc692f733f4a9ca7235acd6d55e63d40..5ee3412a448b5ba03f48490349863b7a29d5de4f 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2002-01-23  Laszlo Peter  <laca@ireland.sun.com>
+
+       * glib/gmessages.c (g_printf_string_upper_bound): return 1 more
+       for the trailing '\0' when using vsnprintf. (#69474)
+
 2002-01-23  Tor Lillqvist  <tml@iki.fi>
 
        * glib/gconvert.c: (strdup_len): Not used on Windows, don't even

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4d7b946cbc692f733f4a9ca7235acd6d55e63d40..5ee3412a448b5ba03f48490349863b7a29d5de4f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-01-23  Laszlo Peter  <laca@ireland.sun.com>
+
+       * glib/gmessages.c (g_printf_string_upper_bound): return 1 more
+       for the trailing '\0' when using vsnprintf. (#69474)
+
 2002-01-23  Tor Lillqvist  <tml@iki.fi>
 
        * glib/gconvert.c: (strdup_len): Not used on Windows, don't even

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 4d7b946cbc692f733f4a9ca7235acd6d55e63d40..5ee3412a448b5ba03f48490349863b7a29d5de4f 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2002-01-23  Laszlo Peter  <laca@ireland.sun.com>
+
+       * glib/gmessages.c (g_printf_string_upper_bound): return 1 more
+       for the trailing '\0' when using vsnprintf. (#69474)
+
 2002-01-23  Tor Lillqvist  <tml@iki.fi>
 
        * glib/gconvert.c: (strdup_len): Not used on Windows, don't even

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4d7b946cbc692f733f4a9ca7235acd6d55e63d40..5ee3412a448b5ba03f48490349863b7a29d5de4f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-01-23  Laszlo Peter  <laca@ireland.sun.com>
+
+       * glib/gmessages.c (g_printf_string_upper_bound): return 1 more
+       for the trailing '\0' when using vsnprintf. (#69474)
+
 2002-01-23  Tor Lillqvist  <tml@iki.fi>
 
        * glib/gconvert.c: (strdup_len): Not used on Windows, don't even

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4d7b946cbc692f733f4a9ca7235acd6d55e63d40..5ee3412a448b5ba03f48490349863b7a29d5de4f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-01-23  Laszlo Peter  <laca@ireland.sun.com>
+
+       * glib/gmessages.c (g_printf_string_upper_bound): return 1 more
+       for the trailing '\0' when using vsnprintf. (#69474)
+
 2002-01-23  Tor Lillqvist  <tml@iki.fi>
 
        * glib/gconvert.c: (strdup_len): Not used on Windows, don't even

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4d7b946cbc692f733f4a9ca7235acd6d55e63d40..5ee3412a448b5ba03f48490349863b7a29d5de4f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-01-23  Laszlo Peter  <laca@ireland.sun.com>
+
+       * glib/gmessages.c (g_printf_string_upper_bound): return 1 more
+       for the trailing '\0' when using vsnprintf. (#69474)
+
 2002-01-23  Tor Lillqvist  <tml@iki.fi>
 
        * glib/gconvert.c: (strdup_len): Not used on Windows, don't even

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4d7b946cbc692f733f4a9ca7235acd6d55e63d40..5ee3412a448b5ba03f48490349863b7a29d5de4f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-01-23  Laszlo Peter  <laca@ireland.sun.com>
+
+       * glib/gmessages.c (g_printf_string_upper_bound): return 1 more
+       for the trailing '\0' when using vsnprintf. (#69474)
+
 2002-01-23  Tor Lillqvist  <tml@iki.fi>
 
        * glib/gconvert.c: (strdup_len): Not used on Windows, don't even

diff --git a/glib/gmessages.c b/glib/gmessages.c
index a3377ed95a49a198335e51558f8e3396c36eb6e0..c8707edc5724cb023b6fe557fa2e0d17062f4fb3 100644 (file)
--- a/glib/gmessages.c
+++ b/glib/gmessages.c
@@ -1181,7 +1181,7 @@ g_printf_string_upper_bound (const gchar *format,
 {
 #if HAVE_C99_VSNPRINTF
   gchar c;
-  return vsnprintf (&c, 1, format, args);
+  return vsnprintf (&c, 1, format, args) + 1;
 #else
   return printf_string_upper_bound (format, TRUE, args);
 #endif