summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-07-10 14:24:55 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-07-10 14:40:42 -0400
commitbe37c47fff3a7baba486c927a5224bec528c1a96 (patch)
tree694811e7ff9540cfb44c97e93e0866b7d954df06
parentf5d3f575c6b77e882ec26f9910276cf9ab1c299d (diff)
edje: fix some small leaks when failing to reapply user-defined data
Summary: this only occurs when the same text parts don't exist in the new layout, which is an extremely unlikely scenario Depends on D9210 Reviewers: cedric, bu5hm4n Reviewed By: cedric, bu5hm4n Subscribers: bu5hm4n, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9211
-rw-r--r--src/lib/edje/edje_load.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 5170411700..40109c0c1b 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -1621,11 +1621,23 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
1621 child = eud->u.table.child; 1621 child = eud->u.table.child;
1622 break; 1622 break;
1623 case EDJE_USER_STRING: 1623 case EDJE_USER_STRING:
1624 eina_stringshare_del(eud->u.string.text);
1625 /* string has extra ref in this case */
1626 if (!had_file)
1627 eina_stringshare_del(eud->u.string.text);
1628 break;
1624 case EDJE_USER_DRAG_STEP: 1629 case EDJE_USER_DRAG_STEP:
1625 case EDJE_USER_DRAG_PAGE: 1630 case EDJE_USER_DRAG_PAGE:
1626 case EDJE_USER_DRAG_VALUE: 1631 case EDJE_USER_DRAG_VALUE:
1627 case EDJE_USER_DRAG_SIZE: 1632 case EDJE_USER_DRAG_SIZE:
1633 break;
1628 case EDJE_USER_TEXT_STYLE: 1634 case EDJE_USER_TEXT_STYLE:
1635 {
1636 Edje_Part_Text_Prop *prop;
1637 EINA_LIST_FREE(eud->u.text_style.props, prop)
1638 free(prop);
1639 }
1640 break;
1629 case EDJE_USER_TEXT_EXPAND: 1641 case EDJE_USER_TEXT_EXPAND:
1630 default: 1642 default:
1631 break; 1643 break;