From: Tom Hacohen <tom@stosb.com>
Date: Mon, 3 Sep 2012 11:14:17 +0000 (+0000)
Subject: Elm layout: Fix segfault in some cases.
X-Git-Tag: submit/efl/20131021.015827~1808
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=064578ac024d8ecfac55f20c0cc48750c1879fe1;p=platform%2Fupstream%2Felementary.git

Elm layout: Fix segfault in some cases.

Apparently this fixes stuff for Daniel Zaoui with some more complicated cases.

SVN revision: 76000
---

diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c
index 81e7e32..278e9c3 100644
--- a/src/lib/elm_layout.c
+++ b/src/lib/elm_layout.c
@@ -70,7 +70,7 @@ _elm_layout_smart_sizing_eval(Evas_Object *obj)
 {
    ELM_LAYOUT_DATA_GET(obj, sd);
 
-   if (sd->needs_size_calc) return;
+   if (!sd || sd->needs_size_calc) return;
    sd->needs_size_calc = EINA_TRUE;
 
    evas_object_smart_changed(obj);
@@ -83,7 +83,7 @@ _on_sub_object_size_hint_change(void *data,
                                 void *event_info __UNUSED__)
 {
    ELM_LAYOUT_DATA_GET(data, sd);
-   if (ELM_WIDGET_DATA(sd)->frozen) return;
+   if (!sd || ELM_WIDGET_DATA(sd)->frozen) return;
    ELM_LAYOUT_CLASS(ELM_WIDGET_DATA(sd)->api)->sizing_eval(data);
 }