mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-01 00:54:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

* editcmd.c (pipe_mail): Eliminate g_strdup_printf().

Browse Source 
(edit_complete_word_cmd): Fix possible buffer overflow.
This commit is contained in:
Pavel Roskin 2003-11-24 20:27:34 +00:00
parent ffb686bfa9
commit f51e86a184
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
edit/ChangeLog
View File

@ -1,3 +1,8 @@
2003-11-24 Andrew V. Samoilov <sav@bcs.zp.ua>
* editcmd.c (pipe_mail): Eliminate g_strdup_printf().
(edit_complete_word_cmd): Fix possible buffer overflow.
2003-11-03 Andrew V. Samoilov <sav@bcs.zp.ua>
* editcmd.c (edit_mail_dialog): Trivial clean-up.

9
edit/editcmd.c
View File

@ -2528,7 +2528,7 @@ static void pipe_mail (WEdit *edit, char *to, char *subject, char *cc)
to = name_quote (to, 0);
subject = name_quote (subject, 0);
cc = name_quote (cc, 0);
s = g_strdup_printf ("mail -s %s -c %s %s", subject, cc, to);
s = g_strconcat ("mail -s ", subject, *cc ? " -c " : "" , cc, " ", to, NULL);
g_free (to);
g_free (subject);
g_free (cc);
@ -2792,7 +2792,7 @@ edit_complete_word_cmd (WEdit *edit)
int word_len = 0, i, num_compl = 0, max_len;
long word_start = 0;
char *bufpos;
char match_expr[MAX_REPL_LEN];
char *match_expr;
struct selection compl[MAX_WORD_COMPLETIONS]; /* completions */
/* don't want to disturb another search */
@ -2809,9 +2809,7 @@ edit_complete_word_cmd (WEdit *edit)
/* prepare match expression */
bufpos = &edit->buffers1[word_start >> S_EDIT_BUF_SIZE]
[word_start & M_EDIT_BUF_SIZE];
strncpy (match_expr, bufpos, word_len);
match_expr[word_len] = '\0';
strcat (match_expr, "[a-zA-Z_0-9]+");
match_expr = g_strdup_printf ("%.*s[a-zA-Z_0-9]+", word_len, bufpos);
/* init search: backward, regexp, whole word, case sensitive */
edit_set_search_parameters (0, 1, 1, 1, 1);
@ -2842,6 +2840,7 @@ edit_complete_word_cmd (WEdit *edit)
}
}
g_free (match_expr);
/* release memory before return */
for (i = 0; i < num_compl; i++)
g_free (compl[i].text);