zmike pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ad6300aa4844798694cbe9cc7d0d0b1646c945b7
commit ad6300aa4844798694cbe9cc7d0d0b1646c945b7 Author: Mike Blumenkrantz <[email protected]> Date: Wed Sep 11 13:38:41 2019 -0400 efl_ui/scrollable_content: handle null cases for scrollable_*_get Summary: these are valid calls and should be handled correctly Reviewers: cedric Reviewed By: cedric Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9880 --- src/lib/elementary/efl_ui_widget_scrollable_content.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/elementary/efl_ui_widget_scrollable_content.c b/src/lib/elementary/efl_ui_widget_scrollable_content.c index cf3ccd8130..c69f7b073d 100644 --- a/src/lib/elementary/efl_ui_widget_scrollable_content.c +++ b/src/lib/elementary/efl_ui_widget_scrollable_content.c @@ -206,6 +206,7 @@ _efl_ui_widget_scrollable_content_scrollable_content_set(Eo *obj, Efl_Ui_Widget_ EOLIAN static Eo * _efl_ui_widget_scrollable_content_scrollable_content_get(const Eo *obj EINA_UNUSED, Efl_Ui_Widget_Scrollable_Content_Data *pd) { + if (!pd->scroller) return NULL; return efl_content_get(pd->scroller); } @@ -224,6 +225,7 @@ _efl_ui_widget_scrollable_content_scrollable_text_set(Eo *obj, Efl_Ui_Widget_Scr EOLIAN static const char * _efl_ui_widget_scrollable_content_scrollable_text_get(const Eo *obj EINA_UNUSED, Efl_Ui_Widget_Scrollable_Content_Data *pd) { + if (!pd->label) return NULL; return elm_object_text_get(pd->label); //return efl_text_get(pd->label); } --
