diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-01-11 19:34:16 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-01-11 19:34:16 +0000 |
| commit | 3cf21b305104e91a28e4ce3a473672b2e88a9469 (patch) | |
| tree | d5b68e4647d4250efd549cc76f530bc824c7c882 | |
| parent | 2284f6cca384e0ccc352bfec7277dc26386cac3d (diff) | |
patch 8.2.4065: computation overflow with large cound for :yankv8.2.4065
Problem: Computation overflow with large cound for :yank.
Solution: Avoid an overflow.
| -rw-r--r-- | src/ex_docmd.c | 5 | ||||
| -rw-r--r-- | src/testdir/test_excmd.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 71343590d0..f16f6009fd 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -2374,7 +2374,10 @@ do_one_cmd( else { ea.line1 = ea.line2; - ea.line2 += n - 1; + if (ea.line2 >= LONG_MAX - (n - 1)) + ea.line2 = LONG_MAX; // avoid overflow + else + ea.line2 += n - 1; ++ea.addr_count; /* * Be vi compatible: no error message for out of range. diff --git a/src/testdir/test_excmd.vim b/src/testdir/test_excmd.vim index 6f648dd4e5..731e9aa94f 100644 --- a/src/testdir/test_excmd.vim +++ b/src/testdir/test_excmd.vim @@ -704,9 +704,14 @@ func Test_address_line_overflow() throw 'Skipped: only works with 64 bit long ints' endif new - call setline(1, 'text') + call setline(1, range(100)) call assert_fails('|.44444444444444444444444', 'E1247:') call assert_fails('|.9223372036854775806', 'E1247:') + + $ + yank 77777777777777777777 + call assert_equal("99\n", @") + bwipe! endfunc diff --git a/src/version.c b/src/version.c index 5f28da33d9..e329775342 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4065, +/**/ 4064, /**/ 4063, |