discomfitor pushed a commit to branch master.

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

commit 209aca1654c19b629a133dd86a668d7549ae9c6c
Author: Mike Blumenkrantz <[email protected]>
Date:   Tue Jun 19 13:41:02 2018 -0400

    elm_colorselector: avoid passing null to efl functions
    
    Summary:
    this check already existed in the function but was not applied to the
    entire function
    
    ref T7030
    Depends on D6322
    
    Reviewers: bu5hm4n, Hermet, woohyun, devilhorns
    
    Reviewed By: bu5hm4n
    
    Subscribers: cedric, #committers
    
    Tags: #efl
    
    Maniphest Tasks: T7030
    
    Differential Revision: https://phab.enlightenment.org/D6323
---
 src/lib/elementary/elm_colorselector.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/elementary/elm_colorselector.c 
b/src/lib/elementary/elm_colorselector.c
index 37bce79856..464290cbc0 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -1419,8 +1419,8 @@ _sub_obj_size_hints_set(Evas_Object *sobj,
    Evas_Coord minw = -1, minh = -1;
 
    elm_coords_finger_size_adjust(timesw, &minw, timesh, &minh);
-   if (sobj && efl_isa(sobj, EFL_CANVAS_LAYOUT_CLASS))
-     edje_object_size_min_restricted_calc(sobj, &minw, &minh, minw, minh);
+   if (!efl_isa(sobj, EFL_CANVAS_LAYOUT_CLASS)) return;
+   edje_object_size_min_restricted_calc(sobj, &minw, &minh, minw, minh);
    evas_object_size_hint_min_set(sobj, minw, minh);
    evas_object_size_hint_max_set(sobj, -1, -1);
 }

-- 


Reply via email to