diff options
author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2018-02-11 19:20:46 +0900 |
---|---|---|
committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2018-02-11 19:22:07 +0900 |
commit | aeece11649b419a2b4675b41782b6f89b125fe93 (patch) | |
tree | 128e25d6a72d24c441b2dfc04fd9ffdf9561d49f | |
parent | eb44d1cb5aecec59d540812303d048eaa5dbd763 (diff) | |
download | efl-aeece11649b419a2b4675b41782b6f89b125fe93.tar.gz |
edje - entry - fix empty item handling
tjhis should fix empty items which might have a null item string...
deal with it
fixes T6668
@fix
-rw-r--r-- | src/lib/edje/edje_entry.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c index 403c946705..809c3d8414 100644 --- a/src/lib/edje/edje_entry.c +++ b/src/lib/edje/edje_entry.c @@ -1036,7 +1036,7 @@ _item_obj_get(Anchor *an, Evas_Object *o, Evas_Object *smart, Evas_Object *clip) EINA_INLIST_FOREACH(en->item_objs, io) { - if (!io->an && io->name && !strcmp(an->name, io->name)) + if (!io->an && io->name && !strcmp(an->name ? an->name : "", io->name)) { io->an = an; return io->obj; @@ -1060,7 +1060,7 @@ _item_obj_get(Anchor *an, Evas_Object *o, Evas_Object *smart, Evas_Object *clip) evas_object_pass_events_set(obj, EINA_TRUE); io->an = an; - io->name = strdup(an->name); + io->name = strdup(an->name ? an->name : ""); io->obj = obj; en->item_objs = (Item_Obj *)eina_inlist_append(EINA_INLIST_GET(en->item_objs), EINA_INLIST_GET(io)); @@ -1493,7 +1493,7 @@ _anchors_get(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) } else if (!evas_textblock_cursor_compare(an->start, an->end)) { - if (an->name) free(an->name); + free(an->name); evas_textblock_cursor_free(an->start); evas_textblock_cursor_free(an->end); en->anchors = eina_list_remove(en->anchors, an); |