[glib] GDBusConnection: Avoid dereferencing vtable for unregistered objects



commit 322c6e93444e74ae99b73f1ae7e3b55563470431
Author: Marco Trevisan (TreviÃo) <mail 3v1n0 net>
Date:   Mon Mar 19 20:13:24 2012 +0100

    GDBusConnection: Avoid dereferencing vtable for unregistered objects
    
    https://bugzilla.gnome.org/show_bug.cgi?id=671988
    
    Signed-off-by: David Zeuthen <davidz redhat com>

 gio/gdbusconnection.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index 5f85e40..44bda5d 100644
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@@ -4663,9 +4663,6 @@ call_in_idle_cb (gpointer user_data)
   guint registration_id;
   guint subtree_registration_id;
 
-  vtable = g_object_get_data (G_OBJECT (invocation), "g-dbus-interface-vtable");
-  g_assert (vtable != NULL && vtable->method_call != NULL);
-
   registration_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (invocation), "g-dbus-registration-id"));
   subtree_registration_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (invocation), "g-dbus-subtree-registration-id"));
 
@@ -4684,6 +4681,9 @@ call_in_idle_cb (gpointer user_data)
       goto out;
     }
 
+  vtable = g_object_get_data (G_OBJECT (invocation), "g-dbus-interface-vtable");
+  g_assert (vtable != NULL && vtable->method_call != NULL);
+
   vtable->method_call (g_dbus_method_invocation_get_connection (invocation),
                        g_dbus_method_invocation_get_sender (invocation),
                        g_dbus_method_invocation_get_object_path (invocation),



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]