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

edje_cc: correctly copy part descriptions when setting part type 

in the case where a part is inherited, changing the type will lead to
broken part/program lookups for the part during resolving in write-out;
memcpy alone is not enough to fix this.

@fix
This commit is contained in:
Mike Blumenkrantz 2015-12-16 14:35:19 -05:00
parent 6eff8ab5ba
commit e14dc0f11d
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bin/edje/edje_cc_handlers.c
View File

@ -5076,8 +5076,13 @@ _part_type_set(unsigned int type)
if (previous)
{
new = _edje_part_description_alloc(type, pc->part, ep->name);
memcpy(new, previous, sizeof (Edje_Part_Description_Common));
eina_hash_add(desc_hash, &new, ep);
parent_desc = previous;
new->state.name = strdup(previous->state.name);
new->state.value = previous->state.value;
st_collections_group_parts_part_description_inherit();
parent_desc = NULL;
_part_desc_free(pc, ep, previous);
ep->default_desc = new;
}
@ -5086,8 +5091,13 @@ _part_type_set(unsigned int type)
{
previous = ep->other.desc[i];
new = _edje_part_description_alloc(type, pc->part, ep->name);
memcpy(new, previous, sizeof (Edje_Part_Description_Common));
eina_hash_add(desc_hash, &new, ep);
parent_desc = previous;
new->state.name = strdup(previous->state.name);
new->state.value = previous->state.value;
st_collections_group_parts_part_description_inherit();
parent_desc = NULL;
_part_desc_free(pc, ep, previous);
ep->other.desc[i] = new;
}
}