herdsman pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=ff8c383649bc170d33c40b3a007662afe80f1024

commit ff8c383649bc170d33c40b3a007662afe80f1024
Author: Daniel Hirt <[email protected]>
Date:   Wed Jun 20 19:24:05 2018 +0300

    Edje load: add safecheck for TEXTBLOCK-specific code path
    
    There is a specific TEXTBLOCK part code path that shouldn't be taken
    for other parts.
    
    @fixes T6279
---
 src/lib/edje/edje_load.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index c0d0ac25a3..c974342fc7 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -1328,7 +1328,8 @@ _edje_object_file_set_internal(Evas_Object *obj, const 
Eina_File *file, const ch
                                    }
                               }
 
-                            if (rp->part->entry_mode > 
EDJE_ENTRY_EDIT_MODE_NONE)
+                            if ((rp->part->type == EDJE_PART_TYPE_TEXTBLOCK) &&
+                                  rp->part->entry_mode > 
EDJE_ENTRY_EDIT_MODE_NONE)
                               {
                                  _edje_entry_real_part_init(ed, rp);
                                  if (!ed->has_entries)

-- 


Reply via email to