Fix Coverity-detected bugs in atkimage.c - allow for possibility

that NULL in-params were passed.  Thanks to Behdad Estafood for
finding problem.

diff --git a/ChangeLog b/ChangeLog
index 2108825..f9f7577 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-20 Bill Haneman <bill.haneman@sun.com>
+
+       * atk/atkimage.c: Bug detected by Behdad Estafood
+       (atk_image_get_position): Allow for NULL-in params.
+       (atk_image_get_size): Allow for NULL in-params.
+       
 2006-03-13 Bill Haneman <bill.haneman@sun.com>
 
        * configure.in, NEWS: Revved to 1.11.3.

diff --git a/atk/atkimage.c b/atk/atkimage.c
index d37332d..1f69fbc 100755 (executable)
--- a/atk/atkimage.c
+++ b/atk/atkimage.c
@@ -103,8 +103,8 @@ atk_image_get_image_size (AtkImage *image,
   }
   else
   {
-    *width = -1;
-    *height = -1;
+    *real_width = -1;
+    *real_height = -1;
   }
 }
 
@@ -182,8 +182,8 @@ atk_image_get_image_position (AtkImage *image,
   }
   else
   {
-    *x = -1;
-    *y = -1;
+    *real_x = -1;
+    *real_y = -1;
   }
 }