Mercurial > vim
changeset 6941:b63f09edb493 v7.4.789
patch 7.4.789
Problem: Using freed memory and crash. (Dominique Pellej)
Solution: Correct use of pointers. (Hirohito Higashi)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Sun, 19 Jul 2015 14:42:23 +0200 |
| parents | 0942c7d802ea |
| children | 758fe8fd4bae |
| files | src/option.c src/version.c |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/option.c +++ b/src/option.c @@ -4943,7 +4943,8 @@ do_set(arg, opt_flags) sprintf((char *)buf_type, "%s", (opt_flags & OPT_LOCAL) ? "local" : "global"); - set_vim_var_string(VV_OPTION_NEW, newval, -1); + set_vim_var_string(VV_OPTION_NEW, + *(char_u **)varp, -1); set_vim_var_string(VV_OPTION_OLD, saved_origval, -1); set_vim_var_string(VV_OPTION_TYPE, buf_type, -1); apply_autocmds(EVENT_OPTIONSET, @@ -5738,8 +5739,8 @@ set_string_option(opt_idx, value, opt_fl char_u buf_type[7]; sprintf((char *)buf_type, "%s", (opt_flags & OPT_LOCAL) ? "local" : "global"); - set_vim_var_string(VV_OPTION_NEW, s, -1); - set_vim_var_string(VV_OPTION_OLD, oldval, -1); + set_vim_var_string(VV_OPTION_NEW, *varp, -1); + set_vim_var_string(VV_OPTION_OLD, saved_oldval, -1); set_vim_var_string(VV_OPTION_TYPE, buf_type, -1); apply_autocmds(EVENT_OPTIONSET, (char_u *)options[opt_idx].fullname, NULL, FALSE, NULL); reset_v_option_vars();