Merge branch 'a11y_check_null_path' into 'main'

a11y: Avoid crashing if GtkAtSpiContext::path is NULL

See merge request GNOME/gtk!5405

2 files changed, 5 insertions, 1 deletions

diff --git a/gtk/a11y/gtkatspicache.c b/gtk/a11y/gtkatspicache.c
index 3b16f24d6f..c24d55923f 100644
--- a/gtk/a11y/gtkatspicache.c
+++ b/gtk/a11y/gtkatspicache.c
@@ -444,6 +444,9 @@ gtk_at_spi_cache_remove_context (GtkAtSpiCache   *self,
   g_return_if_fail (GTK_IS_AT_SPI_CONTEXT (context));
 
   const char *path = gtk_at_spi_context_get_context_path (context);
+  if (path == NULL)
+    return;
+
   if (!g_hash_table_contains (self->contexts_by_path, path))
     return;
 
diff --git a/gtk/a11y/gtkatspiroot.c b/gtk/a11y/gtkatspiroot.c
index b39d0938d4..78c4d7c0de 100644
--- a/gtk/a11y/gtkatspiroot.c
+++ b/gtk/a11y/gtkatspiroot.c
@@ -690,7 +690,8 @@ gtk_at_spi_root_constructed (GObject *gobject)
       /* No need to validate the path */
       self->base_path = g_strconcat (app_path, "/a11y", NULL);
     }
-  else
+
+  if (self->base_path == NULL)
     {
       const char *program_name = g_get_prgname ();