r19264 - in /desktop/unstable/glib2.0/debian: changelog patches/10_log_valist.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Mar 30 09:25:24 2009
New Revision: 19264

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19264
Log:
10_log_valist.patch: new patch, stolen upstream. Copy a va_list 
before using it twice. Closes: #520484.

Added:
    desktop/unstable/glib2.0/debian/patches/10_log_valist.patch
Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/patches/series

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=19264&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog (original)
+++ desktop/unstable/glib2.0/debian/changelog Mon Mar 30 09:25:24 2009
@@ -1,6 +1,8 @@
 glib2.0 (2.20.0-3) UNRELEASED; urgency=low
 
   * Fix debug package section.
+  * 10_log_valist.patch: new patch, stolen upstream. Copy a va_list 
+    before using it twice. Closes: #520484.
 
  -- Josselin Mouette <joss at debian.org>  Fri, 20 Mar 2009 00:26:54 +0100
 

Added: desktop/unstable/glib2.0/debian/patches/10_log_valist.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/10_log_valist.patch?rev=19264&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/10_log_valist.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/10_log_valist.patch Mon Mar 30 09:25:24 2009
@@ -1,0 +1,35 @@
+Debian #520484
+GNOME #577137
+Upstream commit r8021
+
+Index: glib-2.20.0/glib/gmessages.c
+===================================================================
+--- glib-2.20.0.orig/glib/gmessages.c	2009-03-30 11:23:08.084908982 +0200
++++ glib-2.20.0/glib/gmessages.c	2009-03-30 11:23:13.572403900 +0200
+@@ -462,14 +462,23 @@ g_logv (const gchar   *log_domain,
+ 	       * in an out-of-memory situation
+ 	       */
+ 	      gchar buffer[1025];
+-	      gint size;
+-	      size = _g_vsnprintf (buffer, 1024, format, args1);
++              gsize size;
++              va_list args2;
++
++              G_VA_COPY (args2, args1);
++	      size = _g_vsnprintf (buffer, 1024, format, args2);
++              va_end (args2);
+ 
+ 	      log_func (log_domain, test_level, buffer, data);
+ 	    }
+ 	  else
+ 	    {
+-	      gchar *msg = g_strdup_vprintf (format, args1);
++	      gchar *msg;
++              va_list args2;
++
++              G_VA_COPY (args2, args1);
++              msg = g_strdup_vprintf (format, args2);
++              va_end (args2);
+ 
+ 	      log_func (log_domain, test_level, msg, data);
+ 

Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=19264&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series (original)
+++ desktop/unstable/glib2.0/debian/patches/series Mon Mar 30 09:25:24 2009
@@ -2,4 +2,5 @@
 02_gettext-desktopfiles-ubuntu.patch
 03_blacklist-directories.patch
 04_homedir_env.patch
+10_log_valist.patch
 60_wait-longer-for-threads-to-die.patch