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

Canvas text: Don't call callbacks while cursors are in inconsistent states. 

The issue is that in some cases we were calling user code (callbacks)
when some of the nodes were referencing already deleted text nodes. This
caused invalid memory access. This commit delays the callback calling
until after all of the cursors got into a consistent legal state.
This commit is contained in:
Tom Hacohen 2016-06-22 13:42:26 +01:00
parent a192dd0cf3
commit 3dc4490a99
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7064,6 +7064,7 @@ evas_object_textblock_text_markup_set(Eo *eo_obj, const char *text)
EINA_INLIST_GET(o->text_nodes),
EINA_INLIST_GET(co->node)));
eo_event_freeze(o->cursor);
evas_textblock_cursor_paragraph_first(o->cursor);
evas_object_textblock_text_markup_prepend(o->cursor, text);
@ -7074,8 +7075,19 @@ evas_object_textblock_text_markup_set(Eo *eo_obj, const char *text)
evas_textblock_cursor_paragraph_first(o->cursor);
EINA_LIST_FOREACH(o->cursors, l, data)
evas_textblock_cursor_paragraph_first(data);
{
eo_event_freeze(data);
evas_textblock_cursor_paragraph_first(data);
}
EINA_LIST_FOREACH(o->cursors, l, data)
{
eo_event_thaw(data);
eo_event_callback_call(data, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
}
}
eo_event_thaw(o->cursor);
eo_event_callback_call(o->cursor, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
o->markup_text = text;
}