kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edje - entry - fix empty item handling 

tjhis should fix empty items which might have a null item string...
deal with it

fixes T6668

@fix
This commit is contained in:
Carsten Haitzler 2018-02-11 19:20:46 +09:00
parent 43ac3c0b4c
commit dc70d5cb55
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/edje/edje_entry.c
View File

@ -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);