aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/tag.c2
-rw-r--r--test/old/testdir/test_tagjump.vim17
2 files changed, 19 insertions, 0 deletions
diff --git a/src/nvim/tag.c b/src/nvim/tag.c
index 557d41a467..baa862f57a 100644
--- a/src/nvim/tag.c
+++ b/src/nvim/tag.c
@@ -2986,6 +2986,8 @@ static int jumpto_tag(const char *lbuf_arg, int forceit, bool keep_help)
secure = 1;
sandbox++;
curwin->w_cursor.lnum = 1; // start command in line 1
+ curwin->w_cursor.col = 0;
+ curwin->w_cursor.coladd = 0;
do_cmdline_cmd(pbuf);
retval = OK;
diff --git a/test/old/testdir/test_tagjump.vim b/test/old/testdir/test_tagjump.vim
index efc5e4cebe..74ae4a6c73 100644
--- a/test/old/testdir/test_tagjump.vim
+++ b/test/old/testdir/test_tagjump.vim
@@ -1696,4 +1696,21 @@ func Test_tag_guess_short()
set tags& cpoptions-=t
endfunc
+func Test_tag_excmd_with_nostartofline()
+ call writefile(["!_TAG_FILE_ENCODING\tutf-8\t//",
+ \ "f\tXfile\tascii"],
+ \ 'Xtags', 'D')
+ call writefile(['f', 'foobar'], 'Xfile', 'D')
+
+ set nostartofline
+ new Xfile
+ setlocal tags=Xtags
+ normal! G$
+ " This used to cause heap-buffer-overflow
+ tag f
+
+ bwipe!
+ set startofline&
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab