summaryrefslogtreecommitdiffstats
path: root/dbus
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-10-22 16:01:08 +0000
committerHavoc Pennington <hp@redhat.com>2003-10-22 16:01:08 +0000
commiteb9aa9da9564f2df788580394e67ae6105e517fb (patch)
treec04ed9d5e081bcfc1e050ed960c488bad3f617de /dbus
parent10faede1eec77b0687ad007fa59608e96d80317d (diff)
2003-10-22 Havoc Pennington <hp@redhat.com>
* bus/bus.c (bus_context_check_security_policy): fix up assertion * bus/connection.c (bus_transaction_send_from_driver): set the destination to the connection's base service
Diffstat (limited to 'dbus')
-rw-r--r--dbus/dbus-marshal.c2
-rw-r--r--dbus/dbus-message.c10
2 files changed, 8 insertions, 4 deletions
diff --git a/dbus/dbus-marshal.c b/dbus/dbus-marshal.c
index da7bbd4e..428e1fd2 100644
--- a/dbus/dbus-marshal.c
+++ b/dbus/dbus-marshal.c
@@ -1808,6 +1808,8 @@ _dbus_marshal_validate_type (const DBusString *str,
*end_pos = pos + 1;
return TRUE;
}
+
+ _dbus_verbose ("'%c' %d invalid type code\n", (int) *data, (int) *data);
return FALSE;
}
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index d3b1a3d0..ccd4a443 100644
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -4907,13 +4907,15 @@ decode_header_data (const DBusString *data,
if (!_dbus_marshal_validate_type (data, pos, &type, &pos))
{
- _dbus_verbose ("Failed to validate type of named header field\n");
+ _dbus_verbose ("Failed to validate type of named header field pos = %d\n",
+ pos);
return FALSE;
}
if (!_dbus_marshal_validate_arg (data, byte_order, 0, type, -1, pos, &new_pos))
{
- _dbus_verbose ("Failed to validate argument to named header field\n");
+ _dbus_verbose ("Failed to validate argument to named header field pos = %d\n",
+ pos);
return FALSE;
}
@@ -5180,8 +5182,8 @@ load_one_message (DBusMessageLoader *loader,
message = NULL;
oom = FALSE;
-#if 0
- _dbus_verbose_bytes_of_string (&loader->data, 0, header_len + body_len);
+#if 1
+ _dbus_verbose_bytes_of_string (&loader->data, 0, header_len /* + body_len */);
#endif
if (!decode_header_data (&loader->data,