diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-09-04 20:44:42 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-09-04 20:44:42 +0200 |
| commit | c8fe338d64cc6183c03d4c12b1e036a7745e2932 (patch) | |
| tree | 6eb770c301aa439c78d928806bbb003306a53769 /src | |
| parent | d5824ce1b5491df7d2eb0b66189d366fa67b4585 (diff) | |
patch 7.4.2327v7.4.2327
Problem: Freeing a variable that is on the stack.
Solution: Don't free res_tv or err_tv. (Ozaki Kiichi)
Diffstat (limited to 'src')
| -rw-r--r-- | src/channel.c | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/channel.c b/src/channel.c index bbe98be1b2..10ed42e6b7 100644 --- a/src/channel.c +++ b/src/channel.c @@ -2142,7 +2142,7 @@ channel_exe_cmd(channel_T *channel, int part, typval_T *argv) } else { - typval_T *tv; + typval_T *tv = NULL; typval_T res_tv; typval_T err_tv; 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); if (func_call(arg, &argv[2], NULL, NULL, &res_tv) == OK) tv = &res_tv; - else - tv = NULL; } 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 * then return the string "ERROR". */ vim_free(json); - free_tv(tv); err_tv.v_type = VAR_STRING; err_tv.vval.v_string = (char_u *)"ERROR"; - tv = &err_tv; - json = json_encode_nr_expr(id, tv, options | JSON_NL); + json = json_encode_nr_expr(id, &err_tv, options | JSON_NL); } if (json != NULL) { @@ -2191,7 +2187,7 @@ channel_exe_cmd(channel_T *channel, int part, typval_T *argv) --emsg_skip; if (tv == &res_tv) clear_tv(tv); - else if (tv != &err_tv) + else free_tv(tv); } } diff --git a/src/version.c b/src/version.c index 06fb3ef552..4ab697b9ba 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2327, +/**/ 2326, /**/ 2325, |