diff options
| author | Gwanglim Lee <gl77.lee@samsung.com> | 2014-08-06 10:55:32 +0100 |
|---|---|---|
| committer | Daniel Kolesa <d.kolesa@samsung.com> | 2014-08-08 10:28:52 +0100 |
| commit | 9f8044586e74b2521dbe04a9286874e2591716b4 (patch) | |
| tree | 58eff982a94d883e38becc835ebaef4d487ce863 | |
| parent | 156cf4f859fa314b20a2d68a8da9d825302b18db (diff) | |
| download | efl-9f8044586e74b2521dbe04a9286874e2591716b4.tar.gz | |
edje: fix coverity defects
Summary:
CID 1214113: logically dead code
CID 1230295: dereference null return value
CID 1230296: use after free
@fix
Test Plan: N/A
Reviewers: raster, cedric, jpeg, q66
Reviewed By: q66
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D1275
| -rw-r--r-- | src/bin/edje/edje_cc_handlers.c | 4 | ||||
| -rw-r--r-- | src/bin/edje/edje_cc_parse.c | 8 | ||||
| -rw-r--r-- | src/lib/edje/edje_smart.c | 2 |
3 files changed, 3 insertions, 11 deletions
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index 8642e8063d..c46da33d58 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c @@ -5582,9 +5582,9 @@ static void st_collections_group_parts_part_box_items_item_type(void) s = parse_str(0); if (strcmp(s, "GROUP")) { + ERR("parse error %s:%i. token %s not one of: GROUP.", + file_in, line - 1, s); free(s); - ERR("parse error %s:%i. token %s not one of: GROUP.", - file_in, line - 1, s); exit(-1); } free(s); diff --git a/src/bin/edje/edje_cc_parse.c b/src/bin/edje/edje_cc_parse.c index b0b5ba4e8d..14546c1a7d 100644 --- a/src/bin/edje/edje_cc_parse.c +++ b/src/bin/edje/edje_cc_parse.c @@ -715,14 +715,6 @@ parse(char *data, off_t size) } else { - if (do_params) - { - ERR("parse error %s:%i. additional parameters required for '%s' statement", - file_in, line - 1, (char*)eina_list_last_data_get(stack)); - err_show(); - exit(-1); - } - if (new_statement_single()) stack_pop(); } diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c index 6be14de497..816d2d5fdd 100644 --- a/src/lib/edje/edje_smart.c +++ b/src/lib/edje/edje_smart.c @@ -295,7 +295,7 @@ _edje_object_evas_object_smart_show(Eo *obj, Edje *ed) if (edg == ed) continue; rp = evas_object_data_get(edg->obj, "\377 edje.part_obj"); - if (rp->chosen_description->visible) + if ((rp) && (rp->chosen_description->visible)) evas_object_show(edg->obj); } } |