cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ee08fa9b1a88072aa4d12c34b0185fde456922a5
commit ee08fa9b1a88072aa4d12c34b0185fde456922a5
Author: Oleksandr Shcherbina <o.shcherb...@samsung.com>
Date: Thu Apr 16 18:28:18 2015 +0200
evas: fix possible segfault in evas_3d_node_member_add/del.
Summary: @fix
Reviewers: Hermet, cedric
Reviewed By: cedric
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2367
Signed-off-by: Cedric BAIL <ced...@osg.samsung.com>
---
src/lib/evas/canvas/evas_3d_node.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/evas/canvas/evas_3d_node.c
b/src/lib/evas/canvas/evas_3d_node.c
index c9c2fb4..92c6f3b 100644
--- a/src/lib/evas/canvas/evas_3d_node.c
+++ b/src/lib/evas/canvas/evas_3d_node.c
@@ -1124,7 +1124,7 @@ _evas_3d_node_member_add(Eo *obj, Evas_3D_Node_Data *pd,
Evas_3D_Node *member)
return;
}
Evas_3D_Node_Data *pdmember = eo_data_scope_get(member, MY_CLASS);
- if (pdmember->parent == obj)
+ if (!pdmember || pdmember->parent == obj)
return;
if (pdmember->parent)
@@ -1157,7 +1157,7 @@ EOLIAN static void
_evas_3d_node_member_del(Eo *obj, Evas_3D_Node_Data *pd, Evas_3D_Node *member)
{
Evas_3D_Node_Data *pdmember = eo_data_scope_get(member, MY_CLASS);
- if (pdmember->parent != obj)
+ if (!pdmember || pdmember->parent != obj)
{
ERR("Failed to delete a member node (not a member of the given node)");
return;
--
