Enlightenment CVS committal

Author  : barbieri
Project : e17
Module  : libs/evas

Dir     : e17/libs/evas/src/lib/canvas


Modified Files:
        evas_object_intercept.c 


Log Message:
Fix bug of type truncation on 64bits platform.

Returning a pointer (possible 64bits) where an integer (possible
32bits) is expected may truncate the type, returning just one part
that may be full "0", leading to incorrect behavior. This fix checks
against NULL and resulting value is either 0 or 1.

By: Brett Nash (kill-a-1-in-4-billion-crash.patch)

===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_object_intercept.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- evas_object_intercept.c     22 Aug 2007 16:45:37 -0000      1.10
+++ evas_object_intercept.c     13 Sep 2007 14:28:32 -0000      1.11
@@ -54,7 +54,7 @@
    if (!obj->interceptors) return 0;
    if (obj->intercepted) return 0;
    obj->intercepted = 1;
-   ret = (int)obj->interceptors->show.func;
+   ret = ((obj->interceptors->show.func) != NULL);
    if (obj->interceptors->show.func)
      obj->interceptors->show.func(obj->interceptors->show.data, obj);
    obj->intercepted = 0;
@@ -70,7 +70,7 @@
    if (!obj->interceptors) return 0;
    if (obj->intercepted) return 0;
    obj->intercepted = 1;
-   ret = (int)obj->interceptors->hide.func;
+   ret = ((obj->interceptors->hide.func) != NULL);
    if (obj->interceptors->hide.func)
      obj->interceptors->hide.func(obj->interceptors->hide.data, obj);
    obj->intercepted = 0;
@@ -86,7 +86,7 @@
    if (!obj->interceptors) return 0;
    if (obj->intercepted) return 0;
    obj->intercepted = 1;
-   ret = (int)obj->interceptors->move.func;
+   ret = ((obj->interceptors->move.func) != NULL);
    if (obj->interceptors->move.func)
      obj->interceptors->move.func(obj->interceptors->move.data, obj, x, y);
    obj->intercepted = 0;
@@ -102,7 +102,7 @@
    if (!obj->interceptors) return 0;
    if (obj->intercepted) return 0;
    obj->intercepted = 1;
-   ret = (int)obj->interceptors->resize.func;
+   ret = ((obj->interceptors->resize.func) != NULL);
    if (obj->interceptors->resize.func)
      obj->interceptors->resize.func(obj->interceptors->resize.data, obj, w, h);
    obj->intercepted = 0;
@@ -118,7 +118,7 @@
    if (!obj->interceptors) return 0;
    if (obj->intercepted) return 0;
    obj->intercepted = 1;
-   ret = (int)obj->interceptors->raise.func;
+   ret = ((obj->interceptors->raise.func) != NULL);
    if (obj->interceptors->raise.func)
      obj->interceptors->raise.func(obj->interceptors->raise.data, obj);
    obj->intercepted = 0;
@@ -134,7 +134,7 @@
    if (!obj->interceptors) return 0;
    if (obj->intercepted) return 0;
    obj->intercepted = 1;
-   ret = (int)obj->interceptors->lower.func;
+   ret = ((obj->interceptors->lower.func) != NULL);
    if (obj->interceptors->lower.func)
      obj->interceptors->lower.func(obj->interceptors->lower.data, obj);
    obj->intercepted = 0;
@@ -150,7 +150,7 @@
    if (!obj->interceptors) return 0;
    if (obj->intercepted) return 0;
    obj->intercepted = 1;
-   ret = (int)obj->interceptors->stack_above.func;
+   ret = ((obj->interceptors->stack_above.func) != NULL);
    if (obj->interceptors->stack_above.func)
      obj->interceptors->stack_above.func(obj->interceptors->stack_above.data, 
obj, above);
    obj->intercepted = 0;
@@ -166,7 +166,7 @@
    if (!obj->interceptors) return 0;
    if (obj->intercepted) return 0;
    obj->intercepted = 1;
-   ret = (int)obj->interceptors->stack_below.func;
+   ret = ((obj->interceptors->stack_below.func) != NULL);
    if (obj->interceptors->stack_below.func)
      obj->interceptors->stack_below.func(obj->interceptors->stack_below.data, 
obj, below);
    obj->intercepted = 0;
@@ -182,7 +182,7 @@
    if (!obj->interceptors) return 0;
    if (obj->intercepted) return 0;
    obj->intercepted = 1;
-   ret = (int)obj->interceptors->layer_set.func;
+   ret = ((obj->interceptors->layer_set.func) != NULL);
    if (obj->interceptors->layer_set.func)
      obj->interceptors->layer_set.func(obj->interceptors->layer_set.data, obj, 
l);
    obj->intercepted = 0;
@@ -198,7 +198,7 @@
    if (!obj->interceptors) return 0;
    if (obj->intercepted) return 0;
    obj->intercepted = 1;
-   ret = (int)obj->interceptors->color_set.func;
+   ret = ((obj->interceptors->color_set.func) != NULL);
    if (obj->interceptors->color_set.func)
      obj->interceptors->color_set.func(obj->interceptors->color_set.data, obj, 
r, g, b, a);
    obj->intercepted = 0;
@@ -214,7 +214,7 @@
    if (!obj->interceptors) return 0;
    if (obj->intercepted) return 0;
    obj->intercepted = 1;
-   ret = (int)obj->interceptors->clip_set.func;
+   ret = ((obj->interceptors->clip_set.func) != NULL);
    if (obj->interceptors->clip_set.func)
      obj->interceptors->clip_set.func(obj->interceptors->clip_set.data, obj, 
clip);
    obj->intercepted = 0;
@@ -230,7 +230,7 @@
    if (!obj->interceptors) return 0;
    if (obj->intercepted) return 0;
    obj->intercepted = 1;
-   ret = (int)obj->interceptors->clip_unset.func;
+   ret = ((obj->interceptors->clip_unset.func) != NULL);
    if (obj->interceptors->clip_unset.func)
      obj->interceptors->clip_unset.func(obj->interceptors->clip_unset.data, 
obj);
    obj->intercepted = 0;



-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to