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

patch 7.4.2327

Browse Source 
Problem:    Freeing a variable that is on the stack.
Solution:   Don't free res_tv or err_tv. (Ozaki Kiichi)
This commit is contained in:
Bram Moolenaar
2016-09-04 20:44:42 +02:00
parent d5824ce1b5
commit c8fe338d64
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/channel.c
View File

@@ -2142,7 +2142,7 @@ channel_exe_cmd(channel_T *channel, int part, typval_T *argv)
} }
else else
{ {
typval_T *tv; typval_T *tv = NULL;
typval_T res_tv; typval_T res_tv;
typval_T err_tv; typval_T err_tv;
char_u *json = NULL; char_u *json = NULL;
@@ -2159,8 +2159,6 @@ channel_exe_cmd(channel_T *channel, int part, typval_T *argv)
ch_logs(channel, "Calling '%s'", (char *)arg); ch_logs(channel, "Calling '%s'", (char *)arg);
if (func_call(arg, &argv[2], NULL, NULL, &res_tv) == OK) if (func_call(arg, &argv[2], NULL, NULL, &res_tv) == OK)
tv = &res_tv; tv = &res_tv;
else
tv = NULL;
} }
if (argv[id_idx].v_type == VAR_NUMBER) if (argv[id_idx].v_type == VAR_NUMBER)
@@ -2174,11 +2172,9 @@ channel_exe_cmd(channel_T *channel, int part, typval_T *argv)
/* If evaluation failed or the result can't be encoded /* If evaluation failed or the result can't be encoded
* then return the string "ERROR". */ * then return the string "ERROR". */
vim_free(json); vim_free(json);
free_tv(tv);
err_tv.v_type = VAR_STRING; err_tv.v_type = VAR_STRING;
err_tv.vval.v_string = (char_u *)"ERROR"; err_tv.vval.v_string = (char_u *)"ERROR";
tv = &err_tv; json = json_encode_nr_expr(id, &err_tv, options | JSON_NL);
json = json_encode_nr_expr(id, tv, options | JSON_NL);
} }
if (json != NULL) if (json != NULL)
{ {
@@ -2191,7 +2187,7 @@ channel_exe_cmd(channel_T *channel, int part, typval_T *argv)
--emsg_skip; --emsg_skip;
if (tv == &res_tv) if (tv == &res_tv)
clear_tv(tv); clear_tv(tv);
else if (tv != &err_tv) else
free_tv(tv); free_tv(tv);
} }
} }

2
src/version.c
View File

@@ -763,6 +763,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 */
/**/
2327,
/**/ /**/
2326, 2326,
/**/ /**/