diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-05-28 14:25:35 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-05-28 14:25:35 +0100 |
commit | 4d97a565ae8be0d4debba04ebd2ac3e75a0c8010 (patch) | |
tree | 8dbd892afbca901736d61281ec14b173400e81b5 | |
parent | 305abc612330772615638b8a1aa3c51421c7a90b (diff) | |
download | vim-git-4d97a565ae8be0d4debba04ebd2ac3e75a0c8010.tar.gz |
patch 8.2.5037: cursor position may be invalid after "0;" rangev8.2.5037
Problem: Cursor position may be invalid after "0;" range.
Solution: Check the cursor position when it was set by ";" in the range.
-rw-r--r-- | src/ex_docmd.c | 24 | ||||
-rw-r--r-- | src/testdir/test_excmd.vim | 8 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 27 insertions, 7 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index cbf75059e..cfb40e8d5 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -3280,6 +3280,8 @@ parse_cmd_address(exarg_T *eap, char **errormsg, int silent) { int address_count = 1; linenr_T lnum; + int need_check_cursor = FALSE; + int ret = FAIL; // Repeat for all ',' or ';' separated addresses. for (;;) @@ -3290,7 +3292,7 @@ parse_cmd_address(exarg_T *eap, char **errormsg, int silent) lnum = get_address(eap, &eap->cmd, eap->addr_type, eap->skip, silent, eap->addr_count == 0, address_count++); if (eap->cmd == NULL) // error detected - return FAIL; + goto theend; if (lnum == MAXLNUM) { if (*eap->cmd == '%') // '%' - all lines @@ -3335,14 +3337,14 @@ parse_cmd_address(exarg_T *eap, char **errormsg, int silent) // there is no Vim command which uses '%' and // ADDR_WINDOWS or ADDR_TABS *errormsg = _(e_invalid_range); - return FAIL; + goto theend; } break; case ADDR_TABS_RELATIVE: case ADDR_UNSIGNED: case ADDR_QUICKFIX: *errormsg = _(e_invalid_range); - return FAIL; + goto theend; case ADDR_ARGUMENTS: if (ARGCOUNT == 0) eap->line1 = eap->line2 = 0; @@ -3374,7 +3376,7 @@ parse_cmd_address(exarg_T *eap, char **errormsg, int silent) if (eap->addr_type != ADDR_LINES) { *errormsg = _(e_invalid_range); - return FAIL; + goto theend; } ++eap->cmd; @@ -3382,11 +3384,11 @@ parse_cmd_address(exarg_T *eap, char **errormsg, int silent) { fp = getmark('<', FALSE); if (check_mark(fp) == FAIL) - return FAIL; + goto theend; eap->line1 = fp->lnum; fp = getmark('>', FALSE); if (check_mark(fp) == FAIL) - return FAIL; + goto theend; eap->line2 = fp->lnum; ++eap->addr_count; } @@ -3401,10 +3403,13 @@ parse_cmd_address(exarg_T *eap, char **errormsg, int silent) if (!eap->skip) { curwin->w_cursor.lnum = eap->line2; + // Don't leave the cursor on an illegal line or column, but do // accept zero as address, so 0;/PATTERN/ works correctly. + // Check the cursor position before returning. if (eap->line2 > 0) check_cursor(); + need_check_cursor = TRUE; } } else if (*eap->cmd != ',') @@ -3420,7 +3425,12 @@ parse_cmd_address(exarg_T *eap, char **errormsg, int silent) if (lnum == MAXLNUM) eap->addr_count = 0; } - return OK; + ret = OK; + +theend: + if (need_check_cursor) + check_cursor(); + return ret; } /* diff --git a/src/testdir/test_excmd.vim b/src/testdir/test_excmd.vim index 16d435bf0..f55e6a51c 100644 --- a/src/testdir/test_excmd.vim +++ b/src/testdir/test_excmd.vim @@ -717,5 +717,13 @@ func Test_address_line_overflow() bwipe! endfunc +" This was leaving the cursor in line zero +func Test_using_zero_in_range() + new + norm o00 + silent! 0;s/\%') + bwipe! +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index ff2ea1acd..6a5b3ccd5 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 5037, +/**/ 5036, /**/ 5035, |