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

Evas Textblock: increase ref of format before work 

We need to increase ref count for the format prior to calling of
functions that handle the layout.
This resolves valgrind error of accessing already freed memory.
Please note that a scenerio to trigger this exists in test suite, and
for some reason is not being detected by jenkins.
@fix
This commit is contained in:
Daniel Hirt 2014-03-25 17:10:38 +02:00 committed by Tom Hacohen
parent 3cc0e400cd
commit 5778896735
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/evas/canvas/evas_object_textblock.c
View File

@ -5075,6 +5075,7 @@ _layout_pre(Ctxt *c, int *style_pad_l, int *style_pad_r, int *style_pad_t,
{
Evas_Object_Textblock_Format_Item *fi = NULL;
Evas_Object_Textblock_Format *pfmt = c->fmt;
pfmt->ref++;
off += fnode->offset;
/* No need to skip on the first run, or a non-visible one */
@ -5093,6 +5094,8 @@ _layout_pre(Ctxt *c, int *style_pad_l, int *style_pad_r, int *style_pad_t,
_layout_text_append_commit(c, &queue, n, rel);
}
_format_unref_free(c->obj, pfmt);
if ((c->have_underline2) || (c->have_underline))
{
if (*style_pad_b < c->underline_extend)