enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

efl_ui_focus_manager: be more secure

This commit is contained in:
Marcel Hollerbach 2016-12-19 19:24:45 +01:00
parent 924033e88a
commit 200ad8ab50
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/elementary/efl_ui_focus_manager.c
View File

@ -516,6 +516,11 @@ _efl_ui_focus_manager_register_logical(Eo *obj, Efl_Ui_Focus_Manager_Data *pd, E
EINA_SAFETY_ON_NULL_RETURN_VAL(child, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, EINA_FALSE);
if (redirect)
EINA_SAFETY_ON_FALSE_RETURN_VAL(efl_isa(redirect, MY_CLASS), EINA_FALSE);
F_DBG("Manager: %p register %p %p %p", obj, child, parent, redirect);
pnode = node_get(obj, pd, parent);
if (!pnode) return EINA_FALSE;
@ -538,6 +543,11 @@ _efl_ui_focus_manager_register(Eo *obj, Efl_Ui_Focus_Manager_Data *pd, Efl_Ui_Fo
EINA_SAFETY_ON_NULL_RETURN_VAL(child, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, EINA_FALSE);
if (redirect)
EINA_SAFETY_ON_FALSE_RETURN_VAL(efl_isa(redirect, MY_CLASS), EINA_FALSE);
F_DBG("Manager: %p register %p %p %p", obj, child, parent, redirect);
pnode = node_get(obj, pd, parent);
if (!pnode) return EINA_FALSE;
@ -562,6 +572,9 @@ _efl_ui_focus_manager_update_redirect(Eo *obj, Efl_Ui_Focus_Manager_Data *pd, Ef
Node *node = node_get(obj, pd, child);
if (!node) return EINA_FALSE;
if (redirect)
EINA_SAFETY_ON_FALSE_RETURN_VAL(efl_isa(redirect, MY_CLASS), EINA_FALSE);
node->redirect_manager = redirect;
return EINA_TRUE;
@ -647,6 +660,9 @@ _efl_ui_focus_manager_unregister(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Manager_Data
if (!node) return;
F_DBG("Manager: %p unregister %p", obj, child);
//remove the object from the stack if it hasnt dont that until now
//after this its not at the top anymore
//elm_widget_focus_set(node->focusable, EINA_FALSE);