* cspi/spi_accessible.c

(cspi_init_role_table): Do not write beyond end of role_table.
(Accessible_getRole): Use correct type for value returned by
Accessibility_Accessible_getRole().

* libspi/accessible.c (spi_init_role_lookup_table): Do not write
beyond end of role_table. (This fixes bug #98269)

* libspi/application.c: Add include file spi-private.h for
definition of spi_init_any_nil.

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

diff --git a/ChangeLog b/ChangeLog
index dd21fee..5114954 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2002-11-20  Padraig O'Briain  <padraig.obriain@sun.com>
+
+       * cspi/spi_accessible.c
+       (cspi_init_role_table): Do not write beyond end of role_table.
+       (Accessible_getRole): Use correct type for value returned by
+       Accessibility_Accessible_getRole().
+
+       * libspi/accessible.c (spi_init_role_lookup_table): Do not write
+       beyond end of role_table. (This fixes bug #98269)
+
+       * libspi/application.c: Add include file spi-private.h for 
+       definition of spi_init_any_nil.
+
 2002-11-19 Bill Haneman <bill.haneman@sun.com>
 
         FIX for bug 99024.

diff --git a/cspi/spi_accessible.c b/cspi/spi_accessible.c
index 6487f43..d927aca 100644 (file)
--- a/cspi/spi_accessible.c
+++ b/cspi/spi_accessible.c
@@ -181,7 +181,6 @@ cspi_init_role_table (AccessibleRole *role_table)
   role_table [Accessibility_ROLE_FOOTER] = SPI_ROLE_FOOTER;
   role_table [Accessibility_ROLE_PARAGRAPH] = SPI_ROLE_PARAGRAPH;
   role_table [Accessibility_ROLE_RULER] = SPI_ROLE_RULER;
-  role_table [Accessibility_ROLE_LAST_DEFINED] = SPI_ROLE_EXTENDED;
 
   return TRUE;
 }
@@ -515,7 +514,7 @@ Accessible_getRelationSet (Accessible *obj)
 AccessibleRole
 Accessible_getRole (Accessible *obj)
 {
-  AccessibleRole retval;
+  Accessibility_Role retval;
 
   cspi_return_val_if_fail (obj != NULL, SPI_ROLE_INVALID);
 

diff --git a/libspi/accessible.c b/libspi/accessible.c
index d70fbab..e14c807 100644 (file)
--- a/libspi/accessible.c
+++ b/libspi/accessible.c
@@ -118,7 +118,6 @@ spi_init_role_lookup_table (Accessibility_Role *role_table)
   role_table [ATK_ROLE_FOOTER] =              Accessibility_ROLE_FOOTER;
   role_table [ATK_ROLE_PARAGRAPH] =           Accessibility_ROLE_PARAGRAPH;
   role_table [ATK_ROLE_RULER] =               Accessibility_ROLE_RULER;
-  role_table [ATK_ROLE_LAST_DEFINED] =        Accessibility_ROLE_EXTENDED;
   
   return TRUE;
 }

diff --git a/libspi/application.c b/libspi/application.c
index 32f8f90..7e6d77e 100644 (file)
--- a/libspi/application.c
+++ b/libspi/application.c
@@ -27,6 +27,7 @@
 #include <config.h>
 #include <atk/atkutil.h>
 #include <libspi/application.h>
+#include "spi-private.h"
 
 /* Our parent Gtk object type */
 #define PARENT_TYPE SPI_ACCESSIBLE_TYPE