devilhorns pushed a commit to branch master.
commit 8280ef37300aada242a6ffcb808e02f876015a3e
Author: Chris Michael <[email protected]>
Date: Mon Jul 8 08:07:08 2013 +0100
Remove the grab from any lists Before we free it.
NB: Fixes Coverity CID 1039888
Signed-off-by: Chris Michael <[email protected]>
---
src/lib/evas/canvas/evas_key_grab.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/evas/canvas/evas_key_grab.c
b/src/lib/evas/canvas/evas_key_grab.c
index 19b6594..a9f9480 100644
--- a/src/lib/evas/canvas/evas_key_grab.c
+++ b/src/lib/evas/canvas/evas_key_grab.c
@@ -108,11 +108,11 @@ evas_object_grabs_cleanup(Evas_Object *eo_obj
EINA_UNUSED, Evas_Object_Protected
while (obj->grabs)
{
Evas_Key_Grab *g = obj->grabs->data;
+ obj->layer->evas->grabs =
+ eina_list_remove(obj->layer->evas->grabs, g);
+ obj->grabs = eina_list_remove(obj->grabs, g);
if (g->keyname) free(g->keyname);
free(g);
- obj->layer->evas->grabs =
eina_list_remove(obj->layer->evas->grabs,
- g);
- obj->grabs = eina_list_remove(obj->grabs, g);
}
}
}
--
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
