summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-02-11 19:20:46 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-02-11 19:20:46 +0900
commitdc70d5cb55a495cb2d50af9f97ec71c67c7a0ee0 (patch)
tree4ec0d537925380f86c07c9cc1cf4931bd583ebdd
parent43ac3c0b4cf845c6ca02bc9b440666b192eb235f (diff)
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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c
index 3fa1299abb..26c599020b 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)
1036 1036
1037 EINA_INLIST_FOREACH(en->item_objs, io) 1037 EINA_INLIST_FOREACH(en->item_objs, io)
1038 { 1038 {
1039 if (!io->an && io->name && !strcmp(an->name, io->name)) 1039 if (!io->an && io->name && !strcmp(an->name ? an->name : "", io->name))
1040 { 1040 {
1041 io->an = an; 1041 io->an = an;
1042 return io->obj; 1042 return io->obj;
@@ -1060,7 +1060,7 @@ _item_obj_get(Anchor *an, Evas_Object *o, Evas_Object *smart, Evas_Object *clip)
1060 evas_object_pass_events_set(obj, EINA_TRUE); 1060 evas_object_pass_events_set(obj, EINA_TRUE);
1061 1061
1062 io->an = an; 1062 io->an = an;
1063 io->name = strdup(an->name); 1063 io->name = strdup(an->name ? an->name : "");
1064 io->obj = obj; 1064 io->obj = obj;
1065 en->item_objs = (Item_Obj *)eina_inlist_append(EINA_INLIST_GET(en->item_objs), 1065 en->item_objs = (Item_Obj *)eina_inlist_append(EINA_INLIST_GET(en->item_objs),
1066 EINA_INLIST_GET(io)); 1066 EINA_INLIST_GET(io));
@@ -1493,7 +1493,7 @@ _anchors_get(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
1493 } 1493 }
1494 else if (!evas_textblock_cursor_compare(an->start, an->end)) 1494 else if (!evas_textblock_cursor_compare(an->start, an->end))
1495 { 1495 {
1496 if (an->name) free(an->name); 1496 free(an->name);
1497 evas_textblock_cursor_free(an->start); 1497 evas_textblock_cursor_free(an->start);
1498 evas_textblock_cursor_free(an->end); 1498 evas_textblock_cursor_free(an->end);
1499 en->anchors = eina_list_remove(en->anchors, an); 1499 en->anchors = eina_list_remove(en->anchors, an);