[java-atk-wrapper] Avoid returning uninitialized values for unknown objects



commit 87b590dd6f4a8f6b2646080780a04bbcd785a4b1
Author: Samuel Thibault <samuel thibault ens-lyon org>
Date:   Sat Jul 27 18:13:30 2019 +0200

    Avoid returning uninitialized values for unknown objects

 jni/src/jawcomponent.c |  9 +++++++++
 jni/src/jawimage.c     | 10 ++++++++++
 jni/src/jawtext.c      | 13 +++++++++++++
 3 files changed, 32 insertions(+)
---
diff --git a/jni/src/jawcomponent.c b/jni/src/jawcomponent.c
index a98b3fd..8c490bf 100644
--- a/jni/src/jawcomponent.c
+++ b/jni/src/jawcomponent.c
@@ -196,6 +196,10 @@ jaw_component_get_extents (AtkComponent *component,
   JawObject *jaw_obj = JAW_OBJECT(component);
   if(!jaw_obj){
     JAW_DEBUG_I("jaw_obj == NULL");
+    (*x) = 0;
+    (*y) = 0;
+    (*width) = 0;
+    (*height) = 0;
     return;
   }
   ComponentData *data = jaw_object_get_interface_data(jaw_obj,
@@ -204,6 +208,10 @@ jaw_component_get_extents (AtkComponent *component,
   jobject atk_component = (*jniEnv)->NewGlobalRef(jniEnv, data->atk_component);
   if (!atk_component) {
     JAW_DEBUG_I("atk_component == NULL");
+    (*x) = 0;
+    (*y) = 0;
+    (*width) = 0;
+    (*height) = 0;
     return;
   }
 
@@ -219,6 +227,7 @@ jaw_component_get_extents (AtkComponent *component,
 
   if (jrectangle == NULL)
   {
+    JAW_DEBUG_I("jrectangle == NULL");
     (*x) = 0;
     (*y) = 0;
     (*width) = 0;
diff --git a/jni/src/jawimage.c b/jni/src/jawimage.c
index 163749b..7c4f023 100644
--- a/jni/src/jawimage.c
+++ b/jni/src/jawimage.c
@@ -91,6 +91,8 @@ jaw_image_get_image_position (AtkImage *image,
        JawObject *jaw_obj = JAW_OBJECT(image);
        if (!jaw_obj) {
                JAW_DEBUG_I("jaw_obj == NULL");
+               (*x) = 0;
+               (*y) = 0;
                return;
        }
        ImageData *data = jaw_object_get_interface_data(jaw_obj, INTERFACE_IMAGE);
@@ -98,6 +100,8 @@ jaw_image_get_image_position (AtkImage *image,
        jobject atk_image = (*jniEnv)->NewGlobalRef(jniEnv, data->atk_image);
        if (!atk_image) {
                JAW_DEBUG_I("atk_image == NULL");
+               (*x) = 0;
+               (*y) = 0;
                return;
        }
 
@@ -107,6 +111,7 @@ jaw_image_get_image_position (AtkImage *image,
        (*jniEnv)->DeleteGlobalRef(jniEnv, atk_image);
 
        if (jpoint == NULL) {
+               JAW_DEBUG_I("jpoint == NULL");
                (*x) = 0;
                (*y) = 0;
                return;
@@ -162,6 +167,8 @@ jaw_image_get_image_size (AtkImage *image, gint *width, gint *height)
        JawObject *jaw_obj = JAW_OBJECT(image);
        if (!jaw_obj) {
                JAW_DEBUG_I("jaw_obj == NULL");
+               (*width) = 0;
+               (*height) = 0;
                return;
        }
        ImageData *data = jaw_object_get_interface_data(jaw_obj, INTERFACE_IMAGE);
@@ -169,6 +176,8 @@ jaw_image_get_image_size (AtkImage *image, gint *width, gint *height)
        jobject atk_image = (*jniEnv)->NewGlobalRef(jniEnv, data->atk_image);
        if (!atk_image) {
                JAW_DEBUG_I("atk_image == NULL");
+               (*width) = 0;
+               (*height) = 0;
                return;
        }
 
@@ -178,6 +187,7 @@ jaw_image_get_image_size (AtkImage *image, gint *width, gint *height)
        (*jniEnv)->DeleteGlobalRef(jniEnv, atk_image);
 
        if (jdimension == NULL) {
+               JAW_DEBUG_I("jdimension == NULL");
                (*width) = 0;
                (*height) = 0;
                return;
diff --git a/jni/src/jawtext.c b/jni/src/jawtext.c
index 5839fa2..3c8eae3 100644
--- a/jni/src/jawtext.c
+++ b/jni/src/jawtext.c
@@ -327,6 +327,10 @@ jaw_text_get_character_extents (AtkText *text,
   JawObject *jaw_obj = JAW_OBJECT(text);
   if (!jaw_obj) {
     JAW_DEBUG_I("jaw_obj == NULL");
+    *x = 0;
+    *y = 0;
+    *width = 0;
+    *height = 0;
     return;
   }
   TextData *data = jaw_object_get_interface_data(jaw_obj, INTERFACE_TEXT);
@@ -334,6 +338,10 @@ jaw_text_get_character_extents (AtkText *text,
   jobject atk_text = (*jniEnv)->NewGlobalRef(jniEnv, data->atk_text);
   if (!atk_text) {
     JAW_DEBUG_I("atk_text == NULL");
+    *x = 0;
+    *y = 0;
+    *width = 0;
+    *height = 0;
     return;
   }
 
@@ -352,6 +360,11 @@ jaw_text_get_character_extents (AtkText *text,
 
   if (jrect == NULL)
   {
+    JAW_DEBUG_I("jrect == NULL");
+    *x = 0;
+    *y = 0;
+    *width = 0;
+    *height = 0;
     return;
   }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]