[EGIT] [core/efl] master 07/10: evas: protect correctly for object layer not being set.

[Cedric BAIL]

cedric pushed a commit to branch master.

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

commit e9d86e8719123655b89697211f20e543d06adbc0
Author: Cedric BAIL <cedric.b...@samsung.com>
Date:   Thu Mar 13 10:44:15 2014 +0900

    evas: protect correctly for object layer not being set.
    
    FIX CID 1191914, CID 1191915, CID 1191916 and CID 1191917.
---
 src/lib/evas/canvas/evas_stack.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/evas/canvas/evas_stack.c b/src/lib/evas/canvas/evas_stack.c
index 993d90c..aaca427 100644
--- a/src/lib/evas/canvas/evas_stack.c
+++ b/src/lib/evas/canvas/evas_stack.c
@@ -63,7 +63,7 @@ _evas_object_raise(Eo *eo_obj, Evas_Object_Protected_Data 
*obj)
    obj->restack = EINA_TRUE;
    evas_object_change(eo_obj, obj);
    evas_object_inform_call_restack(eo_obj);
-   if (obj->layer->evas->is_frozen) return;
+   if (!obj->layer || obj->layer->evas->is_frozen) return;
    if ((!evas_event_passes_through(eo_obj, obj)) &&
        (!evas_event_freezes_through(eo_obj, obj)) &&
        (!evas_object_is_source_invisible(eo_obj, obj)))
@@ -110,7 +110,7 @@ _evas_object_lower(Eo *eo_obj, Evas_Object_Protected_Data 
*obj)
    obj->restack = EINA_TRUE;
    evas_object_change(eo_obj, obj);
    evas_object_inform_call_restack(eo_obj);
-   if (obj->layer->evas->is_frozen) return;
+   if (!obj->layer || obj->layer->evas->is_frozen) return;
    if ((!evas_event_passes_through(eo_obj, obj)) &&
        (!evas_event_freezes_through(eo_obj, obj)) &&
        (!evas_object_is_source_invisible(eo_obj, obj)))
@@ -185,7 +185,7 @@ _evas_object_stack_above(Eo *eo_obj, 
Evas_Object_Protected_Data *obj, Evas_Objec
    obj->restack = EINA_TRUE;
    evas_object_change(eo_obj, obj);
    evas_object_inform_call_restack(eo_obj);
-   if (obj->layer->evas->is_frozen) return;
+   if (!obj->layer || obj->layer->evas->is_frozen) return;
    if ((!evas_event_passes_through(eo_obj, obj)) &&
        (!evas_event_freezes_through(eo_obj, obj)) &&
        (!evas_object_is_source_invisible(eo_obj, obj)))
@@ -260,7 +260,7 @@ _evas_object_stack_below(Eo *eo_obj, 
Evas_Object_Protected_Data *obj, Evas_Objec
    obj->restack = EINA_TRUE;
    evas_object_change(eo_obj, obj);
    evas_object_inform_call_restack(eo_obj);
-   if (obj->layer->evas->is_frozen) return;
+   if (!obj->layer || obj->layer->evas->is_frozen) return;
    if ((!evas_event_passes_through(eo_obj, obj)) &&
        (!evas_event_freezes_through(eo_obj, obj)) &&
        (!evas_object_is_source_invisible(eo_obj, obj)))

--