Mercurial > vim
changeset 25735:07e23f808680 v8.2.3403
patch 8.2.3403: memory leak for :retab with invalid argument
Commit: https://github.com/vim/vim/commit/2ddb89f8a94425cda1e5491efc80c1ccccb6e08e
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Sep 4 21:20:41 2021 +0200
patch 8.2.3403: memory leak for :retab with invalid argument
Problem: Memory leak for :retab with invalid argument.
Solution: Free the memory. Make error messages consistent.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 04 Sep 2021 21:30:02 +0200 |
parents | 0ae6418b3520 |
children | 1f8bdc0eb4b3 |
files | src/indent.c src/version.c |
diffstat | 2 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/indent.c +++ b/src/indent.c @@ -70,9 +70,12 @@ tabstop_set(char_u *var, int **array) { int n = atoi((char *)cp); + // Catch negative values, overflow and ridiculous big values. if (n < 0 || n > 9999) { semsg(_(e_invarg2), cp); + vim_free(*array); + *array = NULL; return FAIL; } (*array)[t++] = n; @@ -1615,12 +1618,18 @@ ex_retab(exarg_T *eap) else new_ts_str = vim_strnsave(new_ts_str, eap->arg - new_ts_str); #else - new_ts = getdigits(&(eap->arg)); - if (new_ts < 0) + ptr = eap->arg; + new_ts = getdigits(&ptr); + if (new_ts < 0 && *eap->arg == '-') { emsg(_(e_positive)); return; } + if (new_ts < 0 || new_ts > 9999) + { + semsg(_(e_invarg2), eap->arg); + return; + } if (new_ts == 0) new_ts = curbuf->b_p_ts; #endif