Check before casting to interfaces

diff --git a/libspi/action.c b/libspi/action.c
index 7ee015e..4953384 100644 (file)
--- a/libspi/action.c
+++ b/libspi/action.c
@@ -37,7 +37,7 @@ static AtkAction *
 get_action_from_path (const char *path, void *user_data)
 {
   AtkObject *obj = spi_dbus_get_object (path);
-  if (!obj)
+  if (!obj || !ATK_IS_ACTION(obj))
     return NULL;
   return ATK_ACTION (obj);
 }

diff --git a/libspi/component.c b/libspi/component.c
index da54a5e..12b0e2a 100644 (file)
--- a/libspi/component.c
+++ b/libspi/component.c
@@ -37,7 +37,7 @@ static AtkComponent *
 get_component_from_path (const char *path, void *user_data)
 {
   AtkObject *obj = spi_dbus_get_object (path);
-  if (!obj)
+  if (!obj || !ATK_IS_COMPONENT(obj))
     return NULL;
   return ATK_COMPONENT (obj);
 }

diff --git a/libspi/document.c b/libspi/document.c
index 1bf323e..c43f15e 100644 (file)
--- a/libspi/document.c
+++ b/libspi/document.c
@@ -37,7 +37,7 @@ static AtkDocument *
 get_document_from_path (const char *path, void *user_data)
 {
   AtkObject *obj = spi_dbus_get_object (path);
-  if (!obj)
+  if (!obj || !ATK_IS_DOCUMENT(obj))
     return NULL;
   return ATK_DOCUMENT (obj);
 }

diff --git a/libspi/editabletext.c b/libspi/editabletext.c
index 667614a..0d7ce58 100644 (file)
--- a/libspi/editabletext.c
+++ b/libspi/editabletext.c
@@ -37,7 +37,7 @@ static AtkEditableText *
 get_editable_from_path (const char *path, void *user_data)
 {
   AtkObject *obj = spi_dbus_get_object (path);
-  if (!obj)
+  if (!obj || !ATK_IS_EDITABLE_TEXT(obj))
     return NULL;
   return ATK_EDITABLE_TEXT (obj);
 }

diff --git a/libspi/hyperlink.c b/libspi/hyperlink.c
index 6fc93a4..d719fa8 100644 (file)
--- a/libspi/hyperlink.c
+++ b/libspi/hyperlink.c
@@ -37,7 +37,7 @@ static AtkHyperlink *
 get_hyperlink_from_path (const char *path, void *user_data)
 {
   AtkObject *obj = spi_dbus_get_object (path);
-  if (!obj)
+  if (!obj || !ATK_IS_HYPERLINK(obj))
     return NULL;
   return ATK_HYPERLINK (obj);
 }

diff --git a/libspi/hypertext.c b/libspi/hypertext.c
index ca61853..f6e0249 100644 (file)
--- a/libspi/hypertext.c
+++ b/libspi/hypertext.c
@@ -37,7 +37,7 @@ static AtkHypertext *
 get_hypertext_from_path (const char *path, void *user_data)
 {
   AtkObject *obj = spi_dbus_get_object (path);
-  if (!obj)
+  if (!obj || !ATK_IS_HYPERTEXT(obj))
     return NULL;
   return ATK_HYPERTEXT (obj);
 }

diff --git a/libspi/image.c b/libspi/image.c
index 9ac31dc..54e03ce 100644 (file)
--- a/libspi/image.c
+++ b/libspi/image.c
@@ -37,7 +37,7 @@ static AtkImage *
 get_image_from_path (const char *path, void *user_data)
 {
   AtkObject *obj = spi_dbus_get_object (path);
-  if (!obj)
+  if (!obj || !ATK_IS_IMAGE(obj))
     return NULL;
   return ATK_IMAGE (obj);
 }

diff --git a/libspi/selection.c b/libspi/selection.c
index d961351..2b3321e 100644 (file)
--- a/libspi/selection.c
+++ b/libspi/selection.c
@@ -37,7 +37,7 @@ static AtkSelection *
 get_selection_from_path (const char *path, void *user_data)
 {
   AtkObject *obj = spi_dbus_get_object (path);
-  if (!obj)
+  if (!obj || ~ATK_IS_SELECTION(obj))
     return NULL;
   return ATK_SELECTION (obj);
 }

diff --git a/libspi/table.c b/libspi/table.c
index 09392db..8fc1d09 100644 (file)
--- a/libspi/table.c
+++ b/libspi/table.c
@@ -37,7 +37,7 @@ static AtkTable *
 get_table_from_path (const char *path, void *user_data)
 {
   AtkObject *obj = spi_dbus_get_object (path);
-  if (!obj)
+  if (!obj || !ATK_IS_TABLE(obj))
     return NULL;
   return ATK_TABLE (obj);
 }

diff --git a/libspi/text.c b/libspi/text.c
index 8bfff4e..653e0bd 100644 (file)
--- a/libspi/text.c
+++ b/libspi/text.c
@@ -38,7 +38,7 @@ static AtkText *
 get_text_from_path (const char *path, void *user_data)
 {
   AtkObject *obj = spi_dbus_get_object (path);
-  if (!obj)
+  if (!obj || !ATK_IS_TEXT(obj))
     return NULL;
   return ATK_TEXT (obj);
 }

diff --git a/libspi/value.c b/libspi/value.c
index d085d6e..929c484 100644 (file)
--- a/libspi/value.c
+++ b/libspi/value.c
@@ -29,7 +29,7 @@ static AtkValue *
 get_value_from_path (const char *path, void *user_data)
 {
   AtkObject *obj = spi_dbus_get_object (path);
-  if (!obj)
+  if (!obj || !ATK_IS_VALUE(obj))
     return NULL;
   return ATK_VALUE (obj);
 }