edje: add some null checks for nonexistent objects

minor cleanup to fix EVAS_DEBUG_ABORT usage

Reviewed-by: Cedric BAIL <cedric.bail@free.fr>
Differential Revision: https://phab.enlightenment.org/D9361

diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c
index 8255728..2e283a1 100644 (file)
--- a/src/lib/edje/edje_entry.c
+++ b/src/lib/edje/edje_entry.c
@@ -3376,9 +3376,9 @@ _edje_entry_real_part_init(Edje *ed, Edje_Real_Part *rp, Ecore_IMF_Context *ic)
 
    if (rp->part->entry_mode >= EDJE_ENTRY_EDIT_MODE_EDITABLE)
      {
-        evas_object_show(en->cursor_bg);
-        evas_object_show(en->cursor_fg);
-        evas_object_show(en->cursor_fg2);
+        if (en->cursor_bg) evas_object_show(en->cursor_bg);
+        if (en->cursor_fg) evas_object_show(en->cursor_fg);
+        if (en->cursor_fg2) evas_object_show(en->cursor_fg2);
         en->input_panel_enable = EINA_TRUE;
 
 #ifdef HAVE_ECORE_IMF

diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 244d643..497f409 100644 (file)
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -1421,7 +1421,8 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
              for (i = 0; i < ed->table_parts_size; i++)
                {
                   rp = ed->table_parts[i];
-                  evas_object_show(rp->object);
+                  /* SPACER parts do not have objects */
+                  if (rp->object) evas_object_show(rp->object);
                   if (_edje_block_break(ed)) break;
                   if (rp->drag)
                     {