From f4e5948c0fd819f5259f139a9ec009f4110343a1 Mon Sep 17 00:00:00 2001 From: "Myoungwoon Roy, Kim" Date: Wed, 30 Jan 2019 14:54:36 -0500 Subject: [PATCH] elm: fix dereferencing issue and add error handling and remove unreachable codes. Summary: I had fixed dereferencing issue and added chmod error handling(elm_code_file) I had removed unreachable codes which remains after changing arguments initiallization(efl_ui_win) Test Plan: Run unit test cases Reviewers: eagleeye, Jaehyun_Cho, Hermet, zmike Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D7816 --- src/lib/elementary/efl_ui_win.c | 5 ----- src/lib/elementary/elm_code_file.c | 10 +++++++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index eb5f7e0c42..8c0543dc11 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -4886,11 +4886,6 @@ _create_indicator(Evas_Object *obj) const char *indicator_serv_name; indicator_serv_name = "elm_indicator_portrait"; - if (!indicator_serv_name) - { - ERR("Conformant cannot get portrait indicator service name"); - return NULL; - } indicator = elm_plug_add(obj); if (!indicator) diff --git a/src/lib/elementary/elm_code_file.c b/src/lib/elementary/elm_code_file.c index f0b7861aad..d82a7716bd 100644 --- a/src/lib/elementary/elm_code_file.c +++ b/src/lib/elementary/elm_code_file.c @@ -121,6 +121,8 @@ EAPI Elm_Code_File *elm_code_file_new(Elm_Code *code) EAPI Elm_Code_File *elm_code_file_open(Elm_Code *code, const char *path) { + EINA_SAFETY_ON_NULL_RETURN_VAL(code, NULL); + Elm_Code_File *ret; Eina_File *file; Eina_File_Line *line; @@ -214,7 +216,13 @@ EAPI void elm_code_file_save(Elm_Code_File *file) free(tmp); if (have_mode) - chmod(path, mode); + { + if(chmod(path, mode) < 0) + { + ERR("Error in chmod(%s, %s) - %d(%s)\n", path, mode, errno, strerror(errno)); + return; + } + } if (file->parent) {