Mercurial > vim
changeset 15858:3a45b89639fb v8.1.0936
patch 8.1.0936: may leak memory when using 'vartabstop'
commit https://github.com/vim/vim/commit/55c77cf2ea9c15e1ec75d1faf702ec3c9e325271
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Feb 16 19:05:11 2019 +0100
patch 8.1.0936: may leak memory when using 'vartabstop'
Problem: May leak memory when using 'vartabstop'. (Kuang-che Wu)
Solution: Fix handling allocated memory for 'vartabstop'. (closes https://github.com/vim/vim/issues/3976)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 16 Feb 2019 19:15:06 +0100 |
parents | d06d39fecfea |
children | e8fef9635b72 |
files | src/buffer.c src/option.c src/version.c |
diffstat | 3 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buffer.c +++ b/src/buffer.c @@ -2170,9 +2170,7 @@ free_buf_options( vim_free(buf->b_p_vsts_array); buf->b_p_vsts_array = NULL; clear_string_option(&buf->b_p_vts); - if (buf->b_p_vts_array) - vim_free(buf->b_p_vts_array); - buf->b_p_vts_array = NULL; + VIM_CLEAR(buf->b_p_vts_array); #endif #ifdef FEAT_KEYMAP clear_string_option(&buf->b_p_keymap);
--- a/src/option.c +++ b/src/option.c @@ -5594,7 +5594,9 @@ didset_options2(void) (void)check_clipboard_option(); #endif #ifdef FEAT_VARTABS + vim_free(curbuf->b_p_vsts_array); tabstop_set(curbuf->b_p_vsts, &curbuf->b_p_vsts_array); + vim_free(curbuf->b_p_vts_array); tabstop_set(curbuf->b_p_vts, &curbuf->b_p_vts_array); #endif } @@ -7572,14 +7574,14 @@ did_set_string_option( if (errmsg == NULL) { int *oldarray = curbuf->b_p_vts_array; + if (tabstop_set(*varp, &(curbuf->b_p_vts_array))) { - if (oldarray) - vim_free(oldarray); + vim_free(oldarray); #ifdef FEAT_FOLDING if (foldmethodIsIndent(curwin)) foldUpdateAll(curwin); -#endif /* FEAT_FOLDING */ +#endif } else errmsg = e_invarg; @@ -12706,10 +12708,11 @@ check_ff_value(char_u *p) return check_opt_strings(p, p_ff_values, FALSE); } -#ifdef FEAT_VARTABS +#if defined(FEAT_VARTABS) || defined(PROTO) /* * Set the integer values corresponding to the string setting of 'vartabstop'. + * "array" will be set, caller must free it if needed. */ int tabstop_set(char_u *var, int **array) @@ -12752,6 +12755,8 @@ tabstop_set(char_u *var, int **array) } *array = (int *)alloc((unsigned) ((valcount + 1) * sizeof(int))); + if (*array == NULL) + return FALSE; (*array)[0] = valcount; t = 1;