From 208b29f8aea1b2d52a6b1ba60b89bce91b9e40b5 Mon Sep 17 00:00:00 2001 From: Hoyub Lee Date: Tue, 28 Feb 2017 14:50:38 +0900 Subject: [PATCH] e_mod_effect: Fix possible path of dereferencing null object Change-Id: I02558e1e6ae17337565e0c29f8c4217c473621d0 Signed-off-by: Hoyub Lee --- src/e_mod_effect.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/e_mod_effect.c b/src/e_mod_effect.c index eb977fc..a0f7b57 100644 --- a/src/e_mod_effect.c +++ b/src/e_mod_effect.c @@ -239,6 +239,8 @@ _eff_object_setup(E_Client *ec, E_Effect_Group group) E_Comp_Config *cfg; cfg = e_comp_config_get(); + if (!ec) return; + if (group == E_EFFECT_GROUP_KEYBOARD) e_comp_object_effect_set(ec->frame, "keyboard"); else @@ -251,7 +253,7 @@ _eff_object_setup(E_Client *ec, E_Effect_Group group) while (parent_ec->parent) parent_ec = parent_ec->parent; - if ((parent_ec) && (parent_ec != ec) && (parent_ec->launching)) // Launchig case with parent at same time + if ((parent_ec != ec) && (parent_ec->launching)) // Launchig case with parent at same time e_comp_object_effect_set(ec->frame, cfg->effect_style); else if ((efc) && (e_policy_client_is_home_screen(efc->reverse_ec))) // Home key effect senario e_comp_object_effect_set(ec->frame, cfg->effect_style); -- 2.7.4