seoz pushed a commit to branch master.
commit c90a81d4eceafe899b48e7a8f81dea09336495aa
Author: Daniel Juyung Seo <[email protected]>
Date: Sat Jul 6 12:26:59 2013 +0900
elm_toolbar.c: check reorder_from at the start of _items_change.
reorder_from is used here and there.
this fixes dereference before null issue which was spotted by coverity. CID
1039999.
---
src/lib/elm_toolbar.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 843de48..7dece02 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -1489,10 +1489,11 @@ _items_change(Elm_Toolbar_Item *reorder_from,
Elm_Toolbar_Item *reorder_to)
Elm_Toolbar_Item *prev = NULL, *next = NULL;
int tmp;
+ if (!reorder_from) return;
ELM_TOOLBAR_DATA_GET(WIDGET(reorder_from), sd);
if (reorder_from == reorder_to) return;
- if ((reorder_from) && (reorder_to) &&
+ if ((reorder_to) &&
(!reorder_from->separator) && (!reorder_to->separator))
{
prev = ELM_TOOLBAR_ITEM_FROM_INLIST
--
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
