woohyun pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=894c7af10a1bf4fb2220a0db6462865ab2748a46

commit 894c7af10a1bf4fb2220a0db6462865ab2748a46
Author: JunsuChoi <jsuya.c...@samsung.com>
Date:   Wed Apr 3 13:58:35 2019 +0900

    elm_entry: prevent from accessing null pointer
    
    Summary: change ELM_ENTRY_DATA_GET to ELM_ENTRY_DATA_GET_OR_RETURN_VAL
    
    Test Plan: elm_entry_file_set(NULL, ~~~);
    
    Reviewers: YOhoho, Hermet, woohyun
    
    Subscribers: cedric, #reviewers, #committers
    
    Tags: #efl
    
    Differential Revision: https://phab.enlightenment.org/D8544
---
 src/lib/elementary/elm_entry.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 5543504a3d..b229596c4a 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -4984,8 +4984,8 @@ _elm_entry_file_text_format_set(Eo *obj EINA_UNUSED, 
Elm_Entry_Data *sd, Elm_Tex
 EAPI Eina_Bool
 elm_entry_file_set(Evas_Object *obj, const char *file, Elm_Text_Format format)
 {
-   Eina_Bool ret;
-   ELM_ENTRY_DATA_GET(obj, sd);
+   Eina_Bool ret = EINA_FALSE;
+   ELM_ENTRY_DATA_GET_OR_RETURN_VAL(obj, sd, ret);
    ELM_SAFE_FREE(sd->delay_write, ecore_timer_del);
    if (sd->auto_save) _save_do(obj);
    elm_obj_entry_file_text_format_set(obj, format);

-- 


Reply via email to