From 13a283b705dd414d62ce7a7522c4ba622f98ec3d Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Fri, 10 Feb 2006 22:36:57 +0000 Subject: 2006-02-10 John (J5) Palmieri * dbus/dbus-signature.c (dbus_signature_iter_recurse): Correctly deal with nested arrays (Bug #5823) Patch by Thiago Macieira --- ChangeLog | 6 ++++++ dbus/dbus-signature.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a5c85d65..262b8c02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-02-10 John (J5) Palmieri + + * dbus/dbus-signature.c (dbus_signature_iter_recurse): Correctly + deal with nested arrays (Bug #5823) Patch by Thiago Macieira + + 2006-02-10 John (J5) Palmieri * mono/doc/Makefile.am: Fix parallel make problem with mono-doc diff --git a/dbus/dbus-signature.c b/dbus/dbus-signature.c index a66b7191..8902b4ad 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; } -- cgit