From 24b0ae0df5c6dc3f8de2f8a3144132d57deeef32 Mon Sep 17 00:00:00 2001 From: Hosang Kim Date: Tue, 6 Feb 2018 17:58:44 +0900 Subject: [PATCH] ecore/evas: add NULL checks to handle argument is NULL. Summary: ecore_pipe_read_fd/ecore_pipe_write_fd evas_engine_info_set/get Reviewers: woohyun, Jaehyun, Jaehyun_Cho, jpeg Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D5790 --- src/lib/ecore/ecore_pipe.c | 2 ++ src/lib/evas/canvas/evas_main.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/lib/ecore/ecore_pipe.c b/src/lib/ecore/ecore_pipe.c index f26f6bd25d..06b732b500 100644 --- a/src/lib/ecore/ecore_pipe.c +++ b/src/lib/ecore/ecore_pipe.c @@ -140,6 +140,7 @@ EAPI int ecore_pipe_read_fd(Ecore_Pipe *p) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(PIPE_FD_INVALID); + if (!p) return PIPE_FD_INVALID; return p->fd_read; } @@ -201,6 +202,7 @@ EAPI int ecore_pipe_write_fd(Ecore_Pipe *p) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(PIPE_FD_INVALID); + if (!p) return PIPE_FD_INVALID; return p->fd_write; } diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index 472dc03cdb..e98577a714 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c @@ -468,6 +468,8 @@ next_zombie: EAPI Evas_Engine_Info * evas_engine_info_get(const Evas *obj) { + if (!obj) return NULL; + Evas_Public_Data *e = efl_data_scope_get(obj, EVAS_CANVAS_CLASS); Efl_Canvas_Output *output; @@ -485,6 +487,8 @@ evas_engine_info_get(const Evas *obj) EAPI Eina_Bool evas_engine_info_set(Evas *obj, Evas_Engine_Info *info) { + if (!obj) return EINA_FALSE; + Evas_Public_Data *e = efl_data_scope_get(obj, EVAS_CANVAS_CLASS); Efl_Canvas_Output *output;