raster pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=aa11fef2189b321dd09ee2c699c427a1103a1406

commit aa11fef2189b321dd09ee2c699c427a1103a1406
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date:   Mon Jul 11 21:14:51 2016 +0900

    evas object freeing - fix missing null check for layer
    
    fix CID 1039409
---
 src/lib/evas/canvas/evas_object_main.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/lib/evas/canvas/evas_object_main.c 
b/src/lib/evas/canvas/evas_object_main.c
index 7c36a0a..c9051fd 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -267,9 +267,12 @@ evas_object_free(Evas_Object *eo_obj, int clean_layer)
           mask->w = mask->h = 0;
           if (mask->surface)
             {
-               obj->layer->evas->engine.func->image_free
-                     (obj->layer->evas->engine.data.output, mask->surface);
-               mask->surface = NULL;
+               if (obj->layer)
+                 {
+                    obj->layer->evas->engine.func->image_free
+                      (obj->layer->evas->engine.data.output, mask->surface);
+                    mask->surface = NULL;
+                 }
             }
         EINA_COW_WRITE_END(evas_object_mask_cow, obj->mask, mask);
      }

-- 


Reply via email to