[EGIT] [core/efl] master 01/01: edje: fix NULL ptr dereference

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=769aeb5fccfc752c3fde2c0e423a84689d94c571

commit 769aeb5fccfc752c3fde2c0e423a84689d94c571
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Dec 1 10:59:58 2017 +0900

    edje: fix NULL ptr dereference
    
    Fixes CID 1383425
---
 src/lib/edje/edje_util.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 2872317b13..a82620f5d4 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -396,12 +396,12 @@ _edje_object_efl_ui_base_scale_get(Eo *obj EINA_UNUSED, 
Edje *ed)
 }
 
 EAPI double
-edje_object_base_scale_get(const Eo *obj)
+edje_object_base_scale_get(const Evas_Object *obj)
 {
    Edje *ed;
 
    ed = _edje_fetch(obj);
-   if (!ed->file) return 1.0;
+   if (!ed || !ed->file) return 1.0;
    return TO_DOUBLE(ed->file->base_scale);
 }
 

--