Add a NULL check into register_reply

[platform/core/uifw/at-spi2-atk.git] / atk-adaptor / bridge.c

diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index 99a6a36..e59c834 100644 (file)
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -88,6 +88,9 @@ tally_event_reply ()
 {
   static int replies_received = 0;
 
+  if (!spi_global_app_data)
+    return;
+
   replies_received++;
   if (replies_received == 3)
   {
@@ -232,6 +235,14 @@ register_reply (DBusPendingCall *pending, void *user_data)
 
   reply = dbus_pending_call_steal_reply (pending);
   dbus_pending_call_unref (pending);
+
+  if (!spi_global_app_data)
+    {
+      if (reply)
+         dbus_message_unref (reply);
+      return;
+    }
+
   if (reply)
     {
       gchar *app_name, *obj_path;
@@ -262,7 +273,8 @@ register_reply (DBusPendingCall *pending, void *user_data)
     }
   dbus_message_unref (reply);
 
-  get_registered_event_listeners (spi_global_app_data);
+  if (!spi_global_app_data->events_initialized)
+    get_registered_event_listeners (spi_global_app_data);
 }
 
 static gboolean
@@ -270,10 +282,10 @@ register_application (SpiBridge * app)
 {
   DBusMessage *message;
   DBusMessageIter iter;
-  DBusError error;
   DBusPendingCall *pending;
 
-  dbus_error_init (&error);
+  g_free (app->desktop_name);
+  g_free (app->desktop_path);
 
   /* These will be overridden when we get a reply, but in practice these
      defaults should always be correct */
@@ -313,11 +325,8 @@ deregister_application (SpiBridge * app)
 {
   DBusMessage *message;
   DBusMessageIter iter;
-  DBusError error;
   const char *uname;
 
-  dbus_error_init (&error);
-
   message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY,
                                           ATSPI_DBUS_PATH_REGISTRY,
                                           ATSPI_DBUS_INTERFACE_REGISTRY,
@@ -434,6 +443,8 @@ socket_ref_state_set (AtkObject *accessible)
 static void
 socket_embed_hook (AtkSocket * socket, gchar * plug_id)
 {
+  g_return_if_fail (spi_global_register != NULL);
+
   AtkObject *accessible = ATK_OBJECT(socket);
   gchar *plug_name, *plug_path;
   AtkObjectClass *klass;
@@ -649,6 +660,7 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data)
   const char *interface = dbus_message_get_interface (message);
   const char *member = dbus_message_get_member (message);
   DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+  static gboolean registry_lost = FALSE;
 
   if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_SIGNAL)
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
@@ -678,14 +690,23 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data)
       !g_strcmp0(member, "NameOwnerChanged"))
     {
       char *name, *old, *new;
-      result = DBUS_HANDLER_RESULT_HANDLED;
       if (dbus_message_get_args (message, NULL,
                                  DBUS_TYPE_STRING, &name,
                                  DBUS_TYPE_STRING, &old,
                                  DBUS_TYPE_STRING, &new,
                                  DBUS_TYPE_INVALID))
         {
-          if (*old != '\0' && *new == '\0')
+          if (!strcmp (name, "org.a11y.atspi.Registry"))
+            {
+              if (registry_lost && !old[0])
+                {
+                  register_application (spi_global_app_data);
+                  registry_lost = FALSE;
+                }
+              else if (!new[0])
+                registry_lost = TRUE;
+            }
+          else if (*old != '\0' && *new == '\0')
               spi_atk_remove_client (old);
         }
     }
@@ -698,7 +719,7 @@ spi_atk_create_socket (SpiBridge *app)
 {
 #ifndef DISABLE_P2P
   DBusServer *server;
-  DBusError err;
+  DBusError error;
 
   if (getuid () != 0)
   {
@@ -721,12 +742,12 @@ spi_atk_create_socket (SpiBridge *app)
   if (!spi_global_app_data->app_bus_addr)
     return -1;
 
-  dbus_error_init(&err);
-  server = dbus_server_listen(spi_global_app_data->app_bus_addr, &err);
+  dbus_error_init(&error);
+  server = dbus_server_listen(spi_global_app_data->app_bus_addr, &error);
   if (server == NULL)
   {
-    g_warning ("atk-bridge: Couldn't listen on dbus server: %s", err.message);
-    dbus_error_init (&err);
+    g_warning ("atk-bridge: Couldn't listen on dbus server: %s", error.message);
+    dbus_error_free (&error);
     spi_global_app_data->app_bus_addr [0] = '\0';
     g_main_context_unref (spi_global_app_data->main_context);
     spi_global_app_data->main_context = NULL;
@@ -781,6 +802,8 @@ spi_atk_activate ()
           return;
         }
       spi_initialize_cache (treepath);
+      if (spi_global_app_data->bus)
+        droute_path_register (treepath, spi_global_app_data->bus);
     }
 }
 
@@ -918,6 +941,7 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[])
   /* Set up filter and match rules to catch signals */
   dbus_bus_add_match (spi_global_app_data->bus, "type='signal', interface='org.a11y.atspi.Registry', sender='org.a11y.atspi.Registry'", NULL);
   dbus_bus_add_match (spi_global_app_data->bus, "type='signal', interface='org.a11y.atspi.DeviceEventListener', sender='org.a11y.atspi.Registry'", NULL);
+  dbus_bus_add_match (spi_global_app_data->bus, "type='signal', arg0='org.a11y.atspi.Registry', interface='org.freedesktop.DBus', member='NameOwnerChanged'", NULL);
   dbus_connection_add_filter (spi_global_app_data->bus, signal_filter, NULL,
                               NULL);
 
@@ -927,6 +951,7 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[])
   else
     get_registered_event_listeners (spi_global_app_data);
 
+  dbus_error_free (&error);
   return 0;
 }
 
@@ -936,7 +961,8 @@ atk_bridge_adaptor_cleanup (void)
   GList *l;
   GSList *ls;
 
-  g_return_if_fail (inited);
+  if (!inited)
+    return;
 
   if (!spi_global_app_data)
       return;
@@ -963,13 +989,14 @@ atk_bridge_adaptor_cleanup (void)
 
       droute_context_unregister (spi_global_app_data->droute, connection);
       droute_unintercept_dbus (connection);
+      dbus_connection_close (connection);
       dbus_connection_unref (connection);
     }
   g_list_free (spi_global_app_data->direct_connections);
   spi_global_app_data->direct_connections = NULL;
 
   for (ls = clients; ls; ls = ls->next)
-    g_free (l->data);
+    g_free (ls->data);
   g_slist_free (clients);
   clients = NULL;