[maemo-commits] [maemo-commits] r14512 - in projects/haf/trunk/dbus-glib/debian: . patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-10-19 10:26:06 +0300 (Fri, 19 Oct 2007)
New Revision: 14512

Added:
   projects/haf/trunk/dbus-glib/debian/patches/11-add-va_end-to-locate_attributes.patch
Modified:
   projects/haf/trunk/dbus-glib/debian/changelog
Log:
add missing va_end to locate_attributes


Modified: projects/haf/trunk/dbus-glib/debian/changelog
===================================================================
--- projects/haf/trunk/dbus-glib/debian/changelog	2007-10-19 07:00:12 UTC (rev 14511)
+++ projects/haf/trunk/dbus-glib/debian/changelog	2007-10-19 07:26:06 UTC (rev 14512)
@@ -2,8 +2,9 @@
 
   * Replace invalid assert in dbus_g_proxy_begin_call_internal.
   * Fix misplaced dbus_free in demarshal_valuearray. 
+  * Added missing va_end to locate_attributes in dbus-gparser.c.
 
- -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu,  4 Oct 2007 15:26:49 +0300
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 19 Oct 2007 10:25:05 +0300
 
 dbus-glib (0.74-0osso2) experimental; urgency=low
 

Added: projects/haf/trunk/dbus-glib/debian/patches/11-add-va_end-to-locate_attributes.patch
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/11-add-va_end-to-locate_attributes.patch	2007-10-19 07:00:12 UTC (rev 14511)
+++ projects/haf/trunk/dbus-glib/debian/patches/11-add-va_end-to-locate_attributes.patch	2007-10-19 07:26:06 UTC (rev 14512)
@@ -0,0 +1,16 @@
+diff -pur dbus-glib-0.74/dbus/dbus-gparser.c dbus-glib-0.74.new/dbus/dbus-gparser.c
+--- dbus-glib-0.74/dbus/dbus-gparser.c	2006-09-27 15:27:24.000000000 +0300
++++ dbus-glib-0.74.new/dbus/dbus-gparser.c	2007-10-19 10:19:56.823794400 +0300
+@@ -76,7 +76,11 @@ locate_attributes (const char  *element_
+ 
+   while (name != NULL)
+     {
+-      g_return_val_if_fail (retloc != NULL, FALSE);
++      if (retloc == NULL)
++        {
++          va_end (args);
++          return FALSE;
++        }
+ 
+       g_assert (n_attrs < MAX_ATTRS);
+