From e60e56aadada3f35d48ef54e1920d18469dc37b6 Mon Sep 17 00:00:00 2001 From: "se.osadchy" Date: Thu, 6 Mar 2014 18:26:51 +0900 Subject: [PATCH] edje/edje_edit: Check for NULL Summary: Add check for NULL to the edje_edit_state_external_param_set function @fix Reviewers: cedric, raster, seoz Reviewed By: cedric CC: cedric, reutskiy.v.v Differential Revision: https://phab.enlightenment.org/D584 Signed-off-by: Cedric BAIL --- src/lib/edje/edje_edit.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index 62ee4e7fd8..105f25a2a9 100644 --- a/src/lib/edje/edje_edit.c +++ b/src/lib/edje/edje_edit.c @@ -4336,14 +4336,16 @@ edje_edit_state_external_param_set(Evas_Object *obj, const char *part, const cha eina_stringshare_del(sname); } - if (!found) + if (!found && p && external->external_params) external->external_params = eina_list_append(external->external_params, p); - _edje_external_parsed_params_free(rp->typedata.swallow->swallowed_object, + if (rp->typedata.swallow && rp->param1.external_params) + _edje_external_parsed_params_free(rp->typedata.swallow->swallowed_object, rp->param1.external_params); - rp->param1.external_params = \ - _edje_external_params_parse(rp->typedata.swallow->swallowed_object, - external->external_params); + if (rp->typedata.swallow && external->external_params) + rp->param1.external_params = \ + _edje_external_params_parse(rp->typedata.swallow->swallowed_object, + external->external_params); return EINA_TRUE;