diff options
| author | David Zeuthen <davidz@redhat.com> | 2010-04-29 16:20:39 -0400 |
|---|---|---|
| committer | David Zeuthen <davidz@redhat.com> | 2010-04-29 16:20:39 -0400 |
| commit | c14e7c006fb09560c65635d6990e50c01e5dc582 (patch) | |
| tree | 3f6e2f5b6337f5d83e31dc249e448f136bdfca54 | |
| parent | 613d9a9ed07078feb2863fd6c5c2c1c9c8f121a1 (diff) | |
Ensure return_if_fail guards for GDBusMethodInvocation
| -rw-r--r-- | gdbus/gdbusmethodinvocation.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gdbus/gdbusmethodinvocation.c b/gdbus/gdbusmethodinvocation.c index 06b6609..28ab3a1 100644 --- a/gdbus/gdbusmethodinvocation.c +++ b/gdbus/gdbusmethodinvocation.c @@ -538,13 +538,13 @@ g_dbus_method_invocation_new (const gchar *sender, GVariant *parameters, gpointer user_data) { - g_return_val_if_fail (object_path != NULL, NULL); - g_return_val_if_fail (interface_name != NULL, NULL); - g_return_val_if_fail (method_name != NULL, NULL); + g_return_val_if_fail (sender == NULL || g_dbus_is_name (sender), NULL); + g_return_val_if_fail (g_variant_is_object_path (object_path), NULL); + g_return_val_if_fail (interface_name == NULL || g_dbus_is_interface_name (interface_name), NULL); + g_return_val_if_fail (g_dbus_is_member_name (method_name), NULL); g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL); - g_return_val_if_fail (parameters != NULL, NULL); - //g_return_val_if_fail ((g_dbus_connection_get_bus_type (connection) == G_BUS_TYPE_NONE && sender == NULL) || - // (g_dbus_connection_get_bus_type (connection) != G_BUS_TYPE_NONE && sender != NULL), NULL); + g_return_val_if_fail (G_IS_DBUS_MESSAGE (message), NULL); + g_return_val_if_fail (g_variant_is_of_type (parameters, G_VARIANT_TYPE_TUPLE), NULL); return G_DBUS_METHOD_INVOCATION (g_object_new (G_TYPE_DBUS_METHOD_INVOCATION, "sender", sender, |