From: John (J5) Palmieri <johnp@redhat.com>
Date: Fri, 10 Feb 2006 22:36:57 +0000 (+0000)
Subject: 2006-02-10  John (J5) Palmieri  <johnp@redhat.com>
X-Git-Tag: dbus-0.61~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=13a283b705dd414d62ce7a7522c4ba622f98ec3d;p=thirdparty%2Fdbus.git

2006-02-10  John (J5) Palmieri  <johnp@redhat.com>

	* dbus/dbus-signature.c (dbus_signature_iter_recurse): Correctly
	deal with nested arrays (Bug #5823) Patch by Thiago Macieira
	<thiago.macieira at trolltech.com>
---

diff --git a/ChangeLog b/ChangeLog
index a5c85d655..262b8c02f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-10  John (J5) Palmieri  <johnp@redhat.com>
+
+	* dbus/dbus-signature.c (dbus_signature_iter_recurse): Correctly
+	deal with nested arrays (Bug #5823) Patch by Thiago Macieira 
+	<thiago.macieira at trolltech.com>
+
 2006-02-10  John (J5) Palmieri  <johnp@redhat.com>
 
 	* mono/doc/Makefile.am: Fix parallel make problem with mono-doc
diff --git a/dbus/dbus-signature.c b/dbus/dbus-signature.c
index a66b7191c..8902b4ad0 100644
--- a/dbus/dbus-signature.c
+++ b/dbus/dbus-signature.c
@@ -192,9 +192,10 @@ dbus_signature_iter_recurse (const DBusSignatureIter *iter,
   _dbus_return_if_fail (dbus_type_is_container (dbus_signature_iter_get_current_type (iter)));
 
   *real_sub_iter = *real_iter;
+  real_sub_iter->in_array = FALSE;
   real_sub_iter->pos++;
 
-  if (dbus_signature_iter_get_current_type (subiter) == DBUS_TYPE_ARRAY)
+  if (dbus_signature_iter_get_current_type (iter) == DBUS_TYPE_ARRAY)
     real_sub_iter->in_array = TRUE;
 }