diff options
| author | watiko <service@mail.watiko.net> | 2015-11-28 01:31:00 +0900 |
|---|---|---|
| committer | watiko <service@mail.watiko.net> | 2015-11-28 17:22:52 +0900 |
| commit | 09f6066bb48150566ba7f1f44ae4148deb0e02c0 (patch) | |
| tree | cc44d69933834efb694741f5bbeef220bb559962 | |
| parent | 789041c2829d8abb96a0f5f7a844632052a1a448 (diff) | |
| download | rneovim-09f6066bb48150566ba7f1f44ae4148deb0e02c0.tar.gz rneovim-09f6066bb48150566ba7f1f44ae4148deb0e02c0.tar.bz2 rneovim-09f6066bb48150566ba7f1f44ae4148deb0e02c0.zip | |
vim-patch:7.4.789
Problem: Using freed memory and crash. (Dominique Pellej)
Solution: Correct use of pointers. (Hirohito Higashi)
https://github.com/vim/vim/commit/9cac424d05c0e79cd621f1b9f2f01a9f459fcbe6
| -rw-r--r-- | src/nvim/option.c | 7 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 87b213818c..84b953e592 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -1799,7 +1799,8 @@ do_set ( 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, @@ -2384,8 +2385,8 @@ set_string_option ( 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(); diff --git a/src/nvim/version.c b/src/nvim/version.c index 4736d3f186..6bf443dbbf 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -207,7 +207,7 @@ static int included_patches[] = { // 792, 791, // 790, - // 789, + 789, // 788 NA 787, 786, |