aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00
Code Activity

patch 8.0.0264: memory error reported by ubsan

Browse Source 
Problem:    Memory error reported by ubsan, probably for using the string
            returned by execute().
Solution:   NUL terminate the result of execute().
This commit is contained in:
Bram Moolenaar
2017-01-29 20:31:21 +01:00
parent 80627cf51f
commit d297f35eb0
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/evalfunc.c
View File

@@ -2819,7 +2819,17 @@ f_execute(typval_T *argvars, typval_T *rettv)
--list->lv_refcount; --list->lv_refcount;
} }
rettv->vval.v_string = redir_execute_ga.ga_data; /* Need to append a NUL to the result. */
if (ga_grow(&redir_execute_ga, 1) == OK)
{
((char *)redir_execute_ga.ga_data)[redir_execute_ga.ga_len] = NUL;
rettv->vval.v_string = redir_execute_ga.ga_data;
}
else
{
ga_clear(&redir_execute_ga);
rettv->vval.v_string = NULL;
}
msg_silent = save_msg_silent; msg_silent = save_msg_silent;
emsg_silent = save_emsg_silent; emsg_silent = save_emsg_silent;
emsg_noredir = save_emsg_noredir; emsg_noredir = save_emsg_noredir;

2
src/version.c
View File

@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
264,
/**/ /**/
263, 263,
/**/ /**/