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

evas_textblock: prevent textnodes with <ps>/<br> without format node 

this will prevent textnodes content with <ps> or <br> without format node

Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org>
Differential Revision: https://phab.enlightenment.org/D12145
This commit is contained in:
Ali Alzyod 2020-09-14 16:30:06 +00:00 committed by Stefan Schmidt
parent 35f17a13fa
commit 3bd066c7db
2 changed files with 26 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

@ -11055,6 +11055,9 @@ _evas_textblock_node_text_adjust_offsets_to_start(Efl_Canvas_Textblock_Data *o,
size_t pos = 0;
int orig_end;
if ((start == 0) && (end == 0))
return EINA_FALSE;
itr = n->format_node;
if (!itr || (itr->text_node != n)) return EINA_FALSE;

23
src/tests/elementary/elm_test_entry.c
View File

@ -653,6 +653,28 @@ EFL_START_TEST(elm_entry_keycode)
}
EFL_END_TEST
EFL_START_TEST(elm_entry_textnodes_with_no_format)
{
Evas_Object *win, *entry;
win = win_add(NULL, "entry", ELM_WIN_BASIC);
entry = elm_entry_add(win);
evas_object_show(entry);
elm_entry_entry_set(entry, "<br/><br/>");
Evas_Object *tb = elm_entry_textblock_get(entry);
Evas_Textblock_Cursor *c1 = evas_object_textblock_cursor_new(tb);
Evas_Textblock_Cursor *c2 = evas_object_textblock_cursor_new(tb);
evas_textblock_cursor_char_next(c2);
evas_textblock_cursor_range_delete(c1, c2);
elm_entry_cursor_pos_set(entry, 0);
ck_assert(elm_entry_cursor_down(entry));
evas_object_del(entry);
evas_object_del(win);
}
EFL_END_TEST
void elm_test_entry(TCase *tc)
{
tcase_add_test(tc, elm_entry_legacy_type_check);
@ -674,4 +696,5 @@ void elm_test_entry(TCase *tc)
tcase_add_test(tc, elm_entry_test_text_class);
tcase_add_test(tc, elm_entry_test_burmese);
tcase_add_test(tc, elm_entry_keycode);
tcase_add_test(tc, elm_entry_textnodes_with_no_format);
}