jaehyun pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=5c889512ceb084d24566e82979df7dbdaa74e5bf

commit 5c889512ceb084d24566e82979df7dbdaa74e5bf
Author: Jaehyun Cho <jae_hyun....@samsung.com>
Date:   Mon Oct 12 16:46:36 2015 +0900

    toolbar: Fix crash on more_item when shrink mode is set with no item.
    
    Toolbar creates a more_item when shrink mode is
    ELM_TOOLBAR_SHRINK_EXPAND.
    If select mode is ELM_OBJECT_SELECT_MODE_ALWAYS and there is no item
    appended, then toolbar sets a selection on a newly created item.
    In this case, sd->more_item is referenced before the new more_item is
    assigned to sd->more_item.
    
    @fix
---
 src/lib/elm_toolbar.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index aa39481..df2ab90 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -1077,6 +1077,8 @@ _item_select(Elm_Toolbar_Item_Data *it)
 
    if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()) || 
(it->separator) || (it->object))
      return;
+   if ((sd->shrink_mode == ELM_TOOLBAR_SHRINK_EXPAND) && (!sd->more_item))
+     return;
    sel = it->selected;
 
    if ((sd->select_mode != ELM_OBJECT_SELECT_MODE_NONE) &&

-- 


Reply via email to