aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAmitesh Singh <amitesh.sh@samsung.com>2017-12-01 10:59:58 +0900
committerAmitesh Singh <amitesh.sh@samsung.com>2017-12-01 10:59:58 +0900
commit769aeb5fccfc752c3fde2c0e423a84689d94c571 (patch)
treec531e6e7731bd10738b5aa0bfa8a6542f5e4dee2 /src
parentelm_genlist: use the correct elm_object_focus_get function (diff)
downloadefl-769aeb5fccfc752c3fde2c0e423a84689d94c571.tar.gz
edje: fix NULL ptr dereference
Fixes CID 1383425
Diffstat (limited to 'src')
-rw-r--r--src/lib/edje/edje_util.c4
1 files 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);
}