AtSpi2: Fix a crash when fetching supported interfaces.

madewokherd · Apr 13, 2024 · 17a2bb9 · 17a2bb9
1 parent e5a4c63
commit 17a2bb9
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/xalia/AtSpi2/AccessibleProvider.cs b/xalia/AtSpi2/AccessibleProvider.cs
@@ -912,9 +912,10 @@ public override bool WatchProperty(UiDomElement element, GudlExpression expressi
                     case "spi_supported":
                         if (!fetching_supported)
                         {
-                            fetching_supported = true;
-                            wait_for_supported_task = FetchSupported();
-                            Utils.RunTask(wait_for_supported_task);
+                            // Somehow, FetchSupported can complete without waiting, which
+                            // would modify the providers list while it's being iterated to
+                            // call WatchProperty, so delay it to prevent that.
+                            Utils.RunIdle(DoFetchSupported);
                         }
                         break;
                     case "spi_application":
@@ -934,6 +935,16 @@ public override bool WatchProperty(UiDomElement element, GudlExpression expressi
             return false;
         }
 
+        private void DoFetchSupported()
+        {
+            if (!fetching_supported)
+            {
+                fetching_supported = true;
+                wait_for_supported_task = FetchSupported();
+                Utils.RunTask(wait_for_supported_task);
+            }
+        }
+
         private async Task FetchAttributes()
         {
             var old_change_count = attributes_change_count;