From 4767786ca8c868e1b8631c8be10289a209bd2c39 Mon Sep 17 00:00:00 2001 From: JEONGHYUN YUN Date: Fri, 7 Apr 2017 10:58:47 +0900 Subject: [PATCH] edje: fix name check matching correctly This could lead to a crash as we were checking against NULL on the wrong pointer. @fix Reviewers: jpeg, jypark Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D4762 Change-Id: Ie26265ea080dd3ae9f965ff73467d689cf1efd6d Signed-off-by: JEONGHYUN YUN --- src/bin/edje/edje_cc_handlers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index 5835f5b..6f26cd4 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c @@ -3677,8 +3677,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)) -- 2.7.4