dbus: free dbus_message_iter_get_signature result

openSUSE · Sep 24, 2018 · 84a7b68 · 84a7b68
1 parent 350a23b
commit 84a7b68
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/dbus-dict.c b/src/dbus-dict.c
@@ -83,7 +83,6 @@ ni_dbus_message_get_next_dict_entry(DBusMessageIter *iter_dict, struct ni_dbus_d
 	if (!dbus_message_iter_next(&iter_dict_entry))
 		goto error;
 
-	/* ni_debug_dbus("decoding entry %s of type %s", key, dbus_message_iter_get_signature(&iter_dict_entry)); */
 	if (!ni_dbus_message_iter_get_variant(&iter_dict_entry, &entry->datum))
 		goto error;
 

diff --git a/src/dbus-message.c b/src/dbus-message.c
@@ -345,9 +345,13 @@ dbus_bool_t
 ni_dbus_message_iter_get_array_array(DBusMessageIter *iter, ni_dbus_variant_t *variant)
 {
 	dbus_bool_t rv = TRUE;
+	char *signature;
 
-	ni_dbus_array_array_init(variant, 
-			dbus_message_iter_get_signature(iter));
+	if (!(signature = dbus_message_iter_get_signature(iter)))
+		return FALSE;
+
+	ni_dbus_array_array_init(variant, signature);
+	ni_string_free(&signature);
 
 	while (rv && dbus_message_iter_get_arg_type(iter) == DBUS_TYPE_ARRAY) {
 		ni_dbus_variant_t *elem;