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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-10-18 16:03:11 +0300 (Thu, 18 Oct 2007)
New Revision: 14504

Added:
   projects/haf/trunk/dbus-glib/debian/patches/10-fix-free-in-dbus-gvalue.patch
Modified:
   projects/haf/trunk/dbus-glib/debian/changelog
Log:
fix misplaced dbus_free in demarshal_valuearray()


Modified: projects/haf/trunk/dbus-glib/debian/changelog
===================================================================
--- projects/haf/trunk/dbus-glib/debian/changelog	2007-10-18 11:52:26 UTC (rev 14503)
+++ projects/haf/trunk/dbus-glib/debian/changelog	2007-10-18 13:03:11 UTC (rev 14504)
@@ -1,6 +1,7 @@
 dbus-glib (0.74-0osso3~unreleased) experimental; urgency=low
 
   * Replace invalid assert in dbus_g_proxy_begin_call_internal.
+  * Fix misplaced dbus_free in demarshal_valuearray. 
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu,  4 Oct 2007 15:26:49 +0300
 

Added: projects/haf/trunk/dbus-glib/debian/patches/10-fix-free-in-dbus-gvalue.patch
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/10-fix-free-in-dbus-gvalue.patch	2007-10-18 11:52:26 UTC (rev 14503)
+++ projects/haf/trunk/dbus-glib/debian/patches/10-fix-free-in-dbus-gvalue.patch	2007-10-18 13:03:11 UTC (rev 14504)
@@ -0,0 +1,22 @@
+diff -pur dbus-glib-0.74/dbus/dbus-gvalue.c dbus-glib-0.74.new/dbus/dbus-gvalue.c
+--- dbus-glib-0.74/dbus/dbus-gvalue.c	2007-03-29 14:14:51.000000000 +0300
++++ dbus-glib-0.74.new/dbus/dbus-gvalue.c	2007-10-18 15:50:13.436219016 +0300
+@@ -766,7 +766,6 @@ demarshal_valuearray (DBusGValueMarshalC
+       current_sig = dbus_message_iter_get_signature (&subiter);
+       elt_type = _dbus_gtype_from_signature (current_sig, TRUE);
+ 
+-      dbus_free (current_sig);
+       if (elt_type == G_TYPE_INVALID)
+ 	{
+ 	  g_value_array_free (ret);
+@@ -774,8 +773,10 @@ demarshal_valuearray (DBusGValueMarshalC
+ 		       DBUS_GERROR,
+ 		       DBUS_GERROR_INVALID_ARGS,
+ 		       _("Couldn't demarshal argument with signature \"%s\""), current_sig);
++	  dbus_free (current_sig);
+ 	  return FALSE;
+ 	}
++      dbus_free (current_sig);
+       
+       g_value_init (val, elt_type);
+