[at-spi2-core] Add error message for events with the wrong signature
- From: Mike Gorse <mgorse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [at-spi2-core] Add error message for events with the wrong signature
- Date: Wed, 29 Dec 2010 14:48:07 +0000 (UTC)
commit 4ffdea0bc0126cdd8a993376189aac59d4a85139
Author: Mike Gorse <mgorse novell com>
Date: Wed Dec 29 09:50:39 2010 -0500
Add error message for events with the wrong signature
atspi/atspi-event-listener.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/atspi/atspi-event-listener.c b/atspi/atspi-event-listener.c
index aa78562..565f789 100644
--- a/atspi/atspi-event-listener.c
+++ b/atspi/atspi-event-listener.c
@@ -741,6 +741,7 @@ atspi_dbus_handle_event (DBusConnection *bus, DBusMessage *message, void *data)
char *detail = NULL;
const char *category = dbus_message_get_interface (message);
const char *member = dbus_message_get_member (message);
+ const char *signature = dbus_message_get_signature (message);
gchar *name;
gchar *converted_type;
DBusMessageIter iter, iter_variant;
@@ -749,6 +750,12 @@ atspi_dbus_handle_event (DBusConnection *bus, DBusMessage *message, void *data)
dbus_int32_t detail1, detail2;
char *p;
+ if (strcmp (signature, "siiv(so)") != 0)
+ {
+ g_warning ("Got invalid signature %s for signal %s from interface %s\n", signature, member, category);
+ return;
+ }
+
memset (&e, 0, sizeof (e));
if (category)
@@ -761,11 +768,8 @@ atspi_dbus_handle_event (DBusConnection *bus, DBusMessage *message, void *data)
}
category++;
}
- g_return_val_if_fail (dbus_message_iter_get_arg_type (&iter) == DBUS_TYPE_STRING, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
dbus_message_iter_get_basic (&iter, &detail);
dbus_message_iter_next (&iter);
- /* TODO: Return error indicating invalid arguments in next line */
- g_return_val_if_fail (dbus_message_iter_get_arg_type (&iter) == DBUS_TYPE_INT32, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
dbus_message_iter_get_basic (&iter, &detail1);
e.detail1 = detail1;
dbus_message_iter_next (&iter);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]