diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-05-19 12:24:54 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-05-19 12:46:24 +0200 |
| commit | 39f16a0fee3c13f587f80db51346d8e3785783ce (patch) | |
| tree | 6c0acf328d54b2899dff3882e47224e34f175576 /src/nvim/option.c | |
| parent | a5de6770c5d7f331d13b34ece8dc3738b5a0af42 (diff) | |
| download | rneovim-39f16a0fee3c13f587f80db51346d8e3785783ce.tar.gz rneovim-39f16a0fee3c13f587f80db51346d8e3785783ce.tar.bz2 rneovim-39f16a0fee3c13f587f80db51346d8e3785783ce.zip | |
vim-patch:8.0.0342: double free with EXITFREE and setting 'ttytype'
Problem: Double free when compiled with EXITFREE and setting 'ttytype'.
Solution: Avoid setting P_ALLOCED on 'ttytype'. (Dominique Pelle,
closes vim/vim#1461)
https://github.com/vim/vim/commit/673911457d6745b6b779eb769c2f41965592d12c
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 48c874196d..88c458b597 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -913,27 +913,24 @@ void set_number_default(char *name, long val) } #if defined(EXITFREE) -/* - * Free all options. - */ +/// Free all options. void free_all_options(void) { - int i; - - for (i = 0; options[i].fullname; i++) { + for (int i = 0; options[i].fullname; i++) { if (options[i].indir == PV_NONE) { - /* global option: free value and default value. */ - if (options[i].flags & P_ALLOCED && options[i].var != NULL) + // global option: free value and default value. + if ((options[i].flags & P_ALLOCED) && options[i].var != NULL) { free_string_option(*(char_u **)options[i].var); - if (options[i].flags & P_DEF_ALLOCED) + } + if (options[i].flags & P_DEF_ALLOCED) { free_string_option(options[i].def_val[VI_DEFAULT]); - } else if (options[i].var != VAR_WIN - && (options[i].flags & P_STRING)) - /* buffer-local option: free global value */ + } + } else if (options[i].var != VAR_WIN && (options[i].flags & P_STRING)) { + // buffer-local option: free global value free_string_option(*(char_u **)options[i].var); + } } } - #endif |