Mercurial > vim
changeset 33776:9503dc55b5ed v9.0.2108
patch 9.0.2108: [security]: overflow with count for :s command
Commit: https://github.com/vim/vim/commit/ac63787734fda2e294e477af52b3bd601517fa78
Author: Christian Brabandt <cb@256bit.org>
Date: Tue Nov 14 20:45:48 2023 +0100
patch 9.0.2108: [security]: overflow with count for :s command
Problem: [security]: overflow with count for :s command
Solution: Abort the :s command if the count is too large
If the count after the :s command is larger than what fits into a
(signed) long variable, abort with e_value_too_large.
Adds a test with INT_MAX as count and verify it correctly fails.
It seems the return value on Windows using mingw compiler wraps around,
so the initial test using :s/./b/9999999999999999999999999990 doesn't
fail there, since the count is wrapping around several times and finally
is no longer larger than 2147483647. So let's just use 2147483647 in the
test, which hopefully will always cause a failure
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 16 Nov 2023 22:15:10 +0100 |
| parents | 7109d1c57221 |
| children | b69a3eea15bd |
| files | runtime/doc/change.txt runtime/doc/cmdline.txt runtime/doc/tags src/ex_cmds.c src/testdir/test_substitute.vim src/version.c |
| diffstat | 6 files changed, 17 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1,4 +1,4 @@ -*change.txt* For Vim version 9.0. Last change: 2023 Sep 19 +*change.txt* For Vim version 9.0. Last change: 2023 Nov 15 VIM REFERENCE MANUAL by Bram Moolenaar @@ -644,9 +644,9 @@ 4.2 Substitute *:substitute* current line only. When [count] is given, replace in [count] lines, starting with the last line in [range]. When [range] is omitted start in the current line. - *E939* - [count] must be a positive number. Also see - |cmdline-ranges|. + *E939* *E1510* + [count] must be a positive number (max 2147483647) + Also see |cmdline-ranges|. See |:s_flags| for [flags]. The delimiter doesn't need to be /, see
--- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -1,4 +1,4 @@ -*cmdline.txt* For Vim version 9.0. Last change: 2023 May 20 +*cmdline.txt* For Vim version 9.0. Last change: 2023 Nov 15 VIM REFERENCE MANUAL by Bram Moolenaar @@ -362,6 +362,7 @@ terminals) A positive number represents the absolute index of an entry as it is given in the first column of a :history listing. This number remains fixed even if other entries are deleted. + (see |E1510|) A negative number means the relative position of an entry, counted from the newest entry (which has index -1) backwards.
--- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -4514,6 +4514,7 @@ E1507 builtin.txt /*E1507* E1508 editing.txt /*E1508* E1509 editing.txt /*E1509* E151 helphelp.txt /*E151* +E1510 change.txt /*E1510* E152 helphelp.txt /*E152* E153 helphelp.txt /*E153* E154 helphelp.txt /*E154*
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -3993,6 +3993,13 @@ ex_substitute(exarg_T *eap) emsg(_(e_positive_count_required)); return; } + else if (i >= INT_MAX) + { + char buf[20]; + vim_snprintf(buf, sizeof(buf), "%ld", i); + semsg(_(e_val_too_large), buf); + return; + } eap->line1 = eap->line2; eap->line2 += i - 1; if (eap->line2 > curbuf->b_ml.ml_line_count)