From 2db3019c33494666e47e7409337b33c1ab38538b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Fri, 26 Oct 2012 18:19:57 +0000 Subject: [PATCH] edbus: Break while if a error happen in message_arguments_set MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Patch by: José Roberto de Souza SVN revision: 78549 --- src/lib/edbus_message.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/edbus_message.c b/src/lib/edbus_message.c index 4f58d6b..11e6b58 100644 --- a/src/lib/edbus_message.c +++ b/src/lib/edbus_message.c @@ -283,7 +283,7 @@ edbus_message_iter_arguments_vset(EDBus_Message_Iter *iter, const char *signatur EINA_SAFETY_ON_FALSE_RETURN_VAL(iter->writable, EINA_FALSE); dbus_signature_iter_init(&signature_iter, signature); - while ((type = dbus_signature_iter_get_signature(&signature_iter)) && r) + while ((type = dbus_signature_iter_get_signature(&signature_iter))) { if (type[0] != DBUS_TYPE_VARIANT && !type[1]) r = append_basic(type[0], MAKE_PTR_FROM_VA_LIST(ap), @@ -325,7 +325,7 @@ edbus_message_iter_arguments_vset(EDBus_Message_Iter *iter, const char *signatur } dbus_free(type); - if (!dbus_signature_iter_next(&signature_iter)) break; + if (!r || !dbus_signature_iter_next(&signature_iter)) break; continue; error: r = EINA_FALSE; @@ -429,7 +429,7 @@ _edbus_message_arguments_vset(EDBus_Message *msg, const char *signature, va_list EINA_SAFETY_ON_FALSE_RETURN_VAL(iter->writable, EINA_FALSE); dbus_signature_iter_init(&signature_iter, signature); - while ((type = dbus_signature_iter_get_signature(&signature_iter)) && r) + while ((type = dbus_signature_iter_get_signature(&signature_iter))) { if (dbus_type_is_basic(type[0])) r = append_basic(type[0], MAKE_PTR_FROM_VA_LIST(ap), @@ -443,7 +443,7 @@ _edbus_message_arguments_vset(EDBus_Message *msg, const char *signature, va_list } dbus_free(type); - if (!dbus_signature_iter_next(&signature_iter)) break; + if (!r || !dbus_signature_iter_next(&signature_iter)) break; } return r; -- 2.7.4