Enlightenment CVS committal

Author  : barbieri
Project : e17
Module  : proto

Dir     : e17/proto/python-efl/python-evas/evas


Modified Files:
        evas.c_evas_object.pxi evas.c_evas_object_image.pxi 


Log Message:
Check NULL pointer from char* returns

===================================================================
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object.pxi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas.c_evas_object.pxi      5 May 2007 05:51:47 -0000       1.5
+++ evas.c_evas_object.pxi      6 May 2007 17:26:56 -0000       1.6
@@ -98,8 +98,11 @@
 
     def type_get(self):
         "Get the Evas object's type"
+        cdef char *s
         if self.obj:
-            return evas_object_type_get(self.obj)
+            s = evas_object_type_get(self.obj)
+            if s != NULL:
+                return s
 
     property type:
         def __get__(self):
@@ -468,7 +471,10 @@
             self.clip_set(value)
 
     def name_get(self):
-        return evas_object_name_get(self.obj)
+        cdef char *s
+        s = evas_object_name_get(self.obj)
+        if s != NULL:
+            return s
 
     def name_set(self, char *value):
         evas_object_name_set(self.obj, value)
===================================================================
RCS file: 
/cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_image.pxi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas.c_evas_object_image.pxi        5 May 2007 05:51:47 -0000       1.2
+++ evas.c_evas_object_image.pxi        6 May 2007 17:26:56 -0000       1.3
@@ -25,7 +25,15 @@
     def file_get(self):
         cdef char *f, *k
         evas_object_image_file_get(self.obj, &f, &k)
-        return (f, k)
+        if f == NULL:
+            file = None
+        else:
+            file = f
+        if k == NULL:
+            key = None
+        else:
+            key = k
+        return (file, key)
 
     property file:
         def __get__(self):



-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to