devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3d9a6e238af3837e273248c71da4d96daef10352
commit 3d9a6e238af3837e273248c71da4d96daef10352
Author: Chris Michael <cpmich...@osg.samsung.com>
Date: Mon Jan 25 07:47:03 2016 -0500
edje: Fix potential NULL pointer dereference
It is possible that evas_object_data_get here does not return an Edje,
so check the return value. This fixes a coverity reported issue.
@fix
CID1349866
Signed-off-by: Chris Michael <cpmich...@osg.samsung.com>
---
src/lib/edje/edje_util.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 221bd1d..4bb0e9c 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -3505,8 +3505,11 @@ _edje_object_part_swallow(Eo *obj EINA_UNUSED, Edje *ed,
const char *part, Evas_
/* the object is already swallowed in the requested part */
if (rpcur == rp) return EINA_TRUE;
sed = evas_object_data_get(obj_swallow, ".edje");
- /* The object is already swallowed somewhere, unswallow it first */
- edje_object_part_unswallow(sed->obj, obj_swallow);
+ if (sed)
+ {
+ /* The object is already swallowed somewhere, unswallow it first
*/
+ edje_object_part_unswallow(sed->obj, obj_swallow);
+ }
}
if (!rp)
--
