_message_iter_append_multi: bail out safely if a struct isn't filled

In newer versions of libdbus, calling dbus_signature_iter_get_current_type
when the iterator is pointing at the ')' of a struct trips an assertion
failure, rather than just returning INVALID.

1 files changed, 9 insertions, 0 deletions

diff --git a/_dbus_bindings/message-append.c b/_dbus_bindings/message-append.c
index 981e45a..a6e096f 100644
--- a/_dbus_bindings/message-append.c
+++ b/_dbus_bindings/message-append.c
@@ -653,6 +653,7 @@ _message_iter_append_multi(DBusMessageIter *appender,
         goto out;
     }
     ret = 0;
+    more = TRUE;
     while ((contents = PyIter_Next(iterator))) {
 
         if (mode == DBUS_TYPE_ARRAY || mode == DBUS_TYPE_DICT_ENTRY) {
@@ -670,6 +671,14 @@ _message_iter_append_multi(DBusMessageIter *appender,
             }
 #endif
         }
+        else /* struct */ {
+            if (!more) {
+                PyErr_Format(PyExc_TypeError, "Fewer items found in struct's "
+                             "D-Bus signature than in Python arguments ");
+                ret = -1;
+                break;
+            }
+        }
 
         if (mode == DBUS_TYPE_DICT_ENTRY) {
             ret = _message_iter_append_dictentry(&sub_appender, &sub_sig_iter,