timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edje: fix name check matching correctly 

Reviewers: jpeg, jypark

This could lead to a crash as we were checking against NULL on
the wrong pointer.

@fix

Subscribers: cedric, jpeg

Differential Revision: https://phab.enlightenment.org/D4762

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
This commit is contained in:
JEONGHYUN YUN 2017-04-06 14:24:45 -07:00 committed by Cedric BAIL
parent 5ed7378303
commit 5fe350d2f7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/edje/edje_cc_handlers.c
View File

@ -4149,8 +4149,8 @@ _link_combine(void)
if (fabs(ell->ed->state.value - el->ed->state.value) > DBL_EPSILON) continue;
if ((!!ell->ed->state.name) != (!!el->ed->state.name))
{
if (((!!ell->ed->state.name) && strcmp(el->ed->state.name, "default")) ||
((!!el->ed->state.name) && strcmp(ell->ed->state.name, "default")))
if (((!!ell->ed->state.name) && strcmp(ell->ed->state.name, "default")) ||
((!!el->ed->state.name) && strcmp(el->ed->state.name, "default")))
continue;
}
else if (ell->ed->state.name && strcmp(ell->ed->state.name, el->ed->state.name))