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

elm_code: Fix possible crash when deleting a selection 

If there was a multiline selection that ended at the end of a line this could crash
@fix
This commit is contained in:
Andy Williams 2017-06-09 23:40:40 -07:00
parent 84c79f6c49
commit 28311d4327
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib/elementary/elm_code_widget_selection.c
View File

@ -158,7 +158,6 @@ _elm_code_widget_selection_delete_single(Elm_Code_Widget *widget, Elm_Code_Widge
old = elm_code_line_text_get(line, &old_length);
start = elm_code_widget_line_text_position_for_column_get(widget, line, selection->start_col);
end = elm_code_widget_line_text_position_for_column_get(widget, line, selection->end_col);
length = line->length - (end - start + 1);
if (end == line->length)
{
@ -186,8 +185,7 @@ _elm_code_widget_selection_delete_multi(Elm_Code_Widget *widget, Elm_Code_Widget
{
Elm_Code_Line *line;
const char *first, *last;
unsigned int last_length, start, length, i;
int end;
unsigned int last_length, start, length, end, i;
char *content;
Elm_Code_Widget_Selection_Data *selection;
@ -203,14 +201,19 @@ _elm_code_widget_selection_delete_multi(Elm_Code_Widget *widget, Elm_Code_Widget
last = elm_code_line_text_get(line, &last_length);
end = (int)elm_code_widget_line_text_position_for_column_get(widget, line, selection->end_col);
if (selection->end_col == 0)
end = -1;
length = start + last_length - (end + 1);
if (end == line->length)
length = start + last_length - end;
else
length = start + last_length - (end + 1);
content = malloc(sizeof(char) * length);
strncpy(content, first, start);
if (last_length > 0)
strncpy(content + start, last + end + 1, last_length - (end + 1));
{
if (end == last_length)
strncpy(content + start, last + end, last_length - end);
else
strncpy(content + start, last + end + 1, last_length - (end + 1));
}
for (i = line->number; i > selection->start_line; i--)
elm_code_file_line_remove(pd->code->file, i);