2005-11-17 Michael Meeks <michael.meeks@novell.com>

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

diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c
index 0807285..096a5ad 100644 (file)
--- a/atk-bridge/bridge.c
+++ b/atk-bridge/bridge.c
@@ -23,6 +23,7 @@
 
 #include <string.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <libbonobo.h>
@@ -48,6 +49,7 @@ static SpiApplication *this_app = NULL;
 static gboolean registry_died = FALSE;
 static gboolean atk_listeners_registered = FALSE;
 static gint toplevels = 0;
+static gboolean exiting = FALSE;
 
 static guint atk_signal_text_changed;
 static guint atk_signal_children_changed;
@@ -108,6 +110,7 @@ extern void gnome_accessibility_module_init     (void);
 extern void gnome_accessibility_module_shutdown (void);
 
 static int     atk_bridge_initialized = FALSE;
+static pid_t   atk_bridge_pid = 0;
 static guint   atk_bridge_focus_tracker_id = 0;
 static guint   atk_bridge_key_event_listener_id = 0;
 static GArray *listener_ids = NULL;
@@ -154,11 +157,14 @@ atk_bridge_init (gint *argc, gchar **argv[])
       return 0;
     }
   atk_bridge_initialized = TRUE;
+  atk_bridge_pid = getpid ();
 
   if (g_getenv ("ATK_BRIDGE_REDIRECT_LOG"))
   {
-      fname = g_strconcat ("/tmp/", g_get_prgname (), ".at-spi-log");
-      freopen (fname, "w", stderr);
+      fname = g_strconcat ("/tmp/", g_get_prgname (), ".at-spi-log", NULL);
+      /* make sure we're not being redirected - security issue */
+      if (!g_file_test (fname, G_FILE_TEST_IS_SYMLINK))
+         freopen (fname, "w", stderr);
       g_free (fname);
   }
 
@@ -287,9 +293,10 @@ spi_display_name (void)
                canonical_display_name = ":0";
            else
            {
+               gchar *display_p, *screen_p;
                canonical_display_name = g_strdup (display_env);
-               gchar *display_p = strrchr (canonical_display_name, ':');
-               gchar *screen_p = strrchr (canonical_display_name, '.');
+               display_p = strrchr (canonical_display_name, ':');
+               screen_p = strrchr (canonical_display_name, '.');
                if (screen_p && display_p && ((guint) screen_p > (guint) display_p))
                {
                    *screen_p = '\0';
@@ -312,8 +319,12 @@ spi_atk_bridge_get_registry (void)
   if (registry_died || (registry == CORBA_OBJECT_NIL)) {
          CORBA_exception_init (&ev);
          if (registry_died) 
-           DBG (1, g_warning ("registry died! restarting..."));
-         
+            {
+              if (exiting)
+                return CORBA_OBJECT_NIL;
+              else
+               DBG (1, g_warning ("registry died! restarting..."));
+            }
          bonobo_activation_set_activation_env_value ("AT_SPI_DISPLAY", spi_display_name ());
 
          registry = bonobo_activation_activate_from_id (
@@ -483,7 +494,12 @@ spi_atk_bridge_exit_func (void)
       return;
     }
   this_app = NULL;
+  if (atk_bridge_pid != getpid ())
+    {
+      _exit (0);
+    }
 
+  exiting = TRUE;
   /*
    * Check whether we still have windows which have not been deleted.
    */
@@ -500,7 +516,8 @@ spi_atk_bridge_exit_func (void)
       g_assert (bonobo_activate ());
     }
   
-  deregister_application (app);
+  if (!registry_died)
+    deregister_application (app);
 
   DBG (1, g_message ("bridge exit func complete.\n"));
 
@@ -588,6 +605,7 @@ spi_atk_emit_eventv (const GObject         *gobject,
   Accessibility_Event e;
   SpiAccessible      *source;
   AtkObject          *aobject;
+  Accessibility_Registry registry;
 #ifdef SPI_BRIDGE_DEBUG
   CORBA_string s;
 #endif
@@ -628,7 +646,12 @@ spi_atk_emit_eventv (const GObject         *gobject,
       CORBA_free (s);
 #endif
       CORBA_exception_init (&ev);
-      Accessibility_Registry_notifyEvent (spi_atk_bridge_get_registry (), 
+      registry = spi_atk_bridge_get_registry ();
+      if (registry_died) {
+        g_free (e.type);
+        return;
+      }  
+      Accessibility_Registry_notifyEvent (registry, 
                                          &e, &ev);
 #ifdef SPI_BRIDGE_DEBUG
       if (ev._major != CORBA_NO_EXCEPTION)
@@ -638,7 +661,7 @@ spi_atk_emit_eventv (const GObject         *gobject,
                   CORBA_exception_id(&ev));
 #endif       
       if (BONOBO_EX (&ev)) registry_died = TRUE;
-      Accessibility_Accessible_unref (e.source, &ev);
+      bonobo_object_unref (BONOBO_OBJECT (source));
       
       CORBA_exception_free (&ev);
       
@@ -909,7 +932,6 @@ spi_atk_bridge_signal_listener (GSignalInvocationHint *signal_hint,
   CORBA_Object c_obj;
   char *sp = NULL;
   AtkObject *ao;
-  AtkText *text;
   gint detail1 = 0, detail2 = 0;
   SpiAccessible *s_ao = NULL;
 #ifdef SPI_BRIDGE_DEBUG
@@ -999,8 +1021,6 @@ spi_atk_bridge_signal_listener (GSignalInvocationHint *signal_hint,
         }
       else if (signal_query.signal_id == atk_signal_text_selection_changed)
         {
-          text = ATK_TEXT (gobject);
- 
           /* Return NULL as the selected string */
          spi_init_any_nil (&any);
         }
@@ -1019,6 +1039,8 @@ spi_atk_bridge_signal_listener (GSignalInvocationHint *signal_hint,
 
   if (sp)
     g_free (sp);
+  if (any._release)
+    CORBA_free (any._value);
 
   return TRUE;
 }
@@ -1082,6 +1104,8 @@ spi_atk_tidy_windows (void)
       if (atk_state_set_contains_state (stateset, ATK_STATE_ACTIVE))
         {
           spi_atk_emit_eventv (G_OBJECT (child), 0, 0, &any, "window:deactivate");
+          if (registry_died)
+            return;
         }
       g_object_unref (stateset);