diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-05-14 21:29:44 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-05-14 21:29:44 +0100 |
commit | 395bd1f6d3edc9f7edb5d1f2d7deaf5a9e3ab93c (patch) | |
tree | 958af1f513a07d0dfa2702ba8faf27e200f0abdd | |
parent | 788c06a2492b546dd0824b119251cd8ea7da9cb5 (diff) | |
download | vim-git-395bd1f6d3edc9f7edb5d1f2d7deaf5a9e3ab93c.tar.gz |
patch 8.2.4956: reading past end of line with "gf" in Visual block modev8.2.4956
Problem: Reading past end of line with "gf" in Visual block mode.
Solution: Do not include the NUL in the length.
-rw-r--r-- | src/normal.c | 13 | ||||
-rw-r--r-- | src/testdir/test_gf.vim | 15 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 27 insertions, 3 deletions
diff --git a/src/normal.c b/src/normal.c index 1baf68a14..bc3e29e1a 100644 --- a/src/normal.c +++ b/src/normal.c @@ -3671,9 +3671,16 @@ get_visual_text( } if (**pp == NUL) *lenp = 0; - if (has_mbyte && *lenp > 0) - // Correct the length to include all bytes of the last character. - *lenp += (*mb_ptr2len)(*pp + (*lenp - 1)) - 1; + if (*lenp > 0) + { + if (has_mbyte) + // Correct the length to include all bytes of the last + // character. + *lenp += (*mb_ptr2len)(*pp + (*lenp - 1)) - 1; + else if ((*pp)[*lenp - 1] == NUL) + // Do not include a trailing NUL. + *lenp -= 1; + } } reset_VIsual_and_resel(); return OK; diff --git a/src/testdir/test_gf.vim b/src/testdir/test_gf.vim index 3602ba010..1b3b13981 100644 --- a/src/testdir/test_gf.vim +++ b/src/testdir/test_gf.vim @@ -138,6 +138,21 @@ func Test_gf_visual() call assert_equal('Xtest_gf_visual', bufname('%')) call assert_equal(3, getcurpos()[1]) + " do not include the NUL at the end + call writefile(['x'], 'X') + let save_enc = &enc + for enc in ['latin1', 'utf-8'] + exe "set enc=" .. enc + new + call setline(1, 'X') + set nomodified + exe "normal \<C-V>$gf" + call assert_equal('X', bufname()) + bwipe! + endfor + let &enc = save_enc + call delete('X') + " line number in visual area is used for file name if has('unix') bwipe! diff --git a/src/version.c b/src/version.c index 62e2b0af6..821f3680e 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4956, +/**/ 4955, /**/ 4954, |