2007-02-14 Li Yuan <li.yuan@sun.com>

        * libspi/accessible.c:
        (impl_accessibility_accessible_get_attributes):
        Bug #404584. If there is no attributes, just return NULL.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@886 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index 1eefca1f9be9fc2cb90dec633ad9eff3ce6ada36..e81b79a767c5165afd5a0f5b19b40988e57337c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-14  Li Yuan  <li.yuan@sun.com>
+
+       * libspi/accessible.c:
+       (impl_accessibility_accessible_get_attributes):
+       Bug #404584. If there is no attributes, just return NULL.
+
 2007-02-12  Li Yuan  <li.yuan@sun.com>
 
        * configure.in, NEWS: Uprev/release 1.17.0.

diff --git a/libspi/accessible.c b/libspi/accessible.c
index d26784c6c741a02fba7b167db2ce79134bc9a59f..db19bff9eb01655cd5ce866171cede722e79b761 100644 (file)
--- a/libspi/accessible.c
+++ b/libspi/accessible.c
@@ -461,8 +461,10 @@ impl_accessibility_accessible_get_attributes (PortableServer_Servant servant,
     
     g_return_val_if_fail (object != NULL, NULL);
     attributes = atk_object_get_attributes (object);
-    
-    bonobo_return_val_if_fail (attributes != NULL, NULL, ev);
+
+    if (attributes == NULL)
+      return NULL;
+
     n_attributes = g_slist_length (attributes);
     
     retval = CORBA_sequence_CORBA_string__alloc ();