enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

Evas textblock: Fixed an invalid read. 

In some cases an invalid read would occur. This was because we didn't
handle node merging appropriately.

SVN revision: 58701
This commit is contained in:
Tom Hacohen 2011-04-17 08:38:29 +00:00
parent 2bb86cbe4f
commit e6be4f7deb
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
legacy/evas/src/lib/canvas/evas_object_textblock.c
View File

@ -1912,7 +1912,8 @@ _paragraph_free(const Evas_Object *obj, Evas_Object_Textblock_Paragraph *par)
if (par->bidi_props)
evas_bidi_paragraph_props_unref(par->bidi_props);
#endif
if (par->text_node)
/* If we are the active par of the text node, set to NULL */
if (par->text_node && (par->text_node->par == par))
par->text_node->par = NULL;
free(par);
}
@ -4781,6 +4782,14 @@ _evas_textblock_nodes_merge(Evas_Object_Textblock *o, Evas_Object_Textblock_Node
to->format_node = from->format_node;
}
/* When it comes to how we handle it, merging is like removing both nodes
* and creating a new one, se we need to do the needed cleanups. */
if (to->par)
to->par->text_node = NULL;
to->par = NULL;
to->new = EINA_TRUE;
_evas_textblock_cursors_set_node(o, from, to);
_evas_textblock_node_text_remove(o, from);
}