[EGIT] [tools/edi] master 01/03: selection: fix crash when deleting large selection

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=ba2b0dd93f5fdc2bde9dd965557c9aca4c129ec3

commit ba2b0dd93f5fdc2bde9dd965557c9aca4c129ec3
Author: Andy Williams <a...@andywilliams.me>
Date:   Sun May 24 12:58:39 2015 +0100

    selection: fix crash when deleting large selection
    
    snprintf is not the tool for simple string copy
    - especially if not null terminated
---
 elm_code/src/lib/widget/elm_code_widget_selection.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/elm_code/src/lib/widget/elm_code_widget_selection.c 
b/elm_code/src/lib/widget/elm_code_widget_selection.c
index cd837cf..5413daf 100644
--- a/elm_code/src/lib/widget/elm_code_widget_selection.c
+++ b/elm_code/src/lib/widget/elm_code_widget_selection.c
@@ -120,9 +120,9 @@ 
_elm_code_widget_selection_delete_single(Elm_Code_Widget_Data *pd)
    length = line->length - (pd->selection->end_col - pd->selection->start_col 
+ 1);
    content = malloc(sizeof(char) * length);
 
-   snprintf(content, pd->selection->start_col, old);
-   snprintf(content + pd->selection->start_col - 1, old_length - 
pd->selection->end_col + 1,
-            old + pd->selection->end_col);
+   strncpy(content, old, pd->selection->start_col - 1);
+   strncpy(content + pd->selection->start_col - 1, old + 
pd->selection->end_col,
+           old_length - pd->selection->end_col);
    elm_code_line_text_set(line, content, length);
    free(content);
 }
@@ -143,10 +143,10 @@ 
_elm_code_widget_selection_delete_multi(Elm_Code_Widget_Data *pd)
    line = elm_code_file_line_get(pd->code->file, pd->selection->end_line);
    last = elm_code_line_text_get(line, &last_length);
    length = pd->selection->start_col + last_length - pd->selection->end_col + 
1;
-   content = malloc(sizeof(char) * (length + 1));
-   snprintf(content, pd->selection->start_col, first);
-   snprintf(content + pd->selection->start_col - 1, last_length - 
pd->selection->end_col + 1,
-            last + pd->selection->end_col);
+   content = malloc(sizeof(char) * length);
+   strncpy(content, first, pd->selection->start_col - 1);
+   strncpy(content + pd->selection->start_col - 1, last + 
pd->selection->end_col,
+           last_length - pd->selection->end_col);
 
    for (i = line->number; i > pd->selection->start_line; i--)
      elm_code_file_line_remove(pd->code->file, i);

--