diff options
author | Bram Moolenaar <Bram@vim.org> | 2021-12-30 15:29:18 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-12-30 15:29:18 +0000 |
commit | 94f3192b03ed27474db80b4d3a409e107140738b (patch) | |
tree | 0072263578a64fc1ca12eca38d3a923fb73273e0 /src/charset.c | |
parent | 4c13e5e6763c6eb36a343a2b8235ea227202e952 (diff) |
patch 8.2.3950: going beyond the end of the line with /\%Vv8.2.3950
Problem: Going beyond the end of the line with /\%V.
Solution: Check for valid column in getvcol().
Diffstat (limited to 'src/charset.c')
-rw-r--r-- | src/charset.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/charset.c b/src/charset.c index 31b03eb38a..d762a2545b 100644 --- a/src/charset.c +++ b/src/charset.c @@ -1240,10 +1240,15 @@ getvcol( posptr = NULL; // continue until the NUL else { - // Special check for an empty line, which can happen on exit, when - // ml_get_buf() always returns an empty string. - if (*ptr == NUL) - pos->col = 0; + colnr_T i; + + // In a few cases the position can be beyond the end of the line. + for (i = 0; i < pos->col; ++i) + if (ptr[i] == NUL) + { + pos->col = i; + break; + } posptr = ptr + pos->col; if (has_mbyte) // always start on the first byte |