Merge branch 'fix_114' into 'main'

Don't crash on an empty, but non-null cached children array

Closes #114

See merge request GNOME/at-spi2-core!139

1 files changed, 6 insertions, 3 deletions

diff --git a/atspi/atspi-accessible.c b/atspi/atspi-accessible.c
index 54f67c8f..1ce6b707 100644
--- a/atspi/atspi-accessible.c
+++ b/atspi/atspi-accessible.c
@@ -490,9 +490,12 @@ atspi_accessible_get_child_at_index (AtspiAccessible *obj,
       if (!obj->children)
         return NULL; /* assume disposed */
 
-      child = g_ptr_array_index (obj->children, child_index);
-      if (child)
-        return g_object_ref (child);
+      if (child_index < obj->children->len)
+        {
+          child = g_ptr_array_index (obj->children, child_index);
+          if (child)
+            return g_object_ref (child);
+        }
     }
 
   reply = _atspi_dbus_call_partial (obj, atspi_interface_accessible,