From af7efb7ad0ee2f991696d8dcbeab8676a8823857 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Thu, 20 Dec 2012 05:07:23 +0000 Subject: [PATCH] edje_entry: check NULL parameter SVN revision: 81418 --- legacy/edje/src/lib/edje_entry.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/legacy/edje/src/lib/edje_entry.c b/legacy/edje/src/lib/edje_entry.c index 38b74713fa..b95cd1fadc 100644 --- a/legacy/edje/src/lib/edje_entry.c +++ b/legacy/edje/src/lib/edje_entry.c @@ -1758,7 +1758,7 @@ _edje_part_mouse_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS Evas_Textblock_Cursor *tc = NULL; Eina_Bool dosel = EINA_FALSE; Eina_Bool shift; - if (!rp) return; + if ((!rp) || (!ev)) return; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; if ((rp->type != EDJE_RP_TYPE_TEXT) || (!rp->typedata.text)) return; @@ -1990,7 +1990,7 @@ _edje_part_mouse_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED Entry *en; Evas_Coord x, y, w, h; Evas_Textblock_Cursor *tc; - if (ev->button != 1) return; + if ((!ev) || (ev->button != 1)) return; if (!rp) return; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; if (ev->flags & EVAS_BUTTON_TRIPLE_CLICK) return; @@ -2101,7 +2101,7 @@ _edje_part_mouse_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS Entry *en; Evas_Coord x, y, w, h; Evas_Textblock_Cursor *tc; - if (!rp) return; + if ((!rp) || (!ev)) return; if ((rp->type != EDJE_RP_TYPE_TEXT) || (!rp->typedata.text)) return; en = rp->typedata.text->entry_data; @@ -2197,6 +2197,7 @@ static void _evas_focus_in_cb(void *data, Evas *e, __UNUSED__ void *event_info) { Edje *ed = (Edje *)data; + if (!ed) return; if (evas_focus_get(e) == ed->obj) { @@ -2208,6 +2209,7 @@ static void _evas_focus_out_cb(void *data, Evas *e, __UNUSED__ void *event_info) { Edje *ed = (Edje *)data; + if (!ed) return; if (evas_focus_get(e) == ed->obj) { @@ -2236,7 +2238,7 @@ _edje_entry_init(Edje *ed) void _edje_entry_shutdown(Edje *ed) { - if (!ed->has_entries) + if ((!ed) || (!ed->has_entries)) return; if (!ed->entries_inited) return;