aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/search.c3
-rw-r--r--src/nvim/testdir/test_textobjects.vim10
2 files changed, 12 insertions, 1 deletions
diff --git a/src/nvim/search.c b/src/nvim/search.c
index 4ca0b25243..b386c6a7c4 100644
--- a/src/nvim/search.c
+++ b/src/nvim/search.c
@@ -3969,6 +3969,9 @@ static int find_next_quote(char_u *line, int col, int quotechar, char_u *escape)
return -1;
} else if (escape != NULL && vim_strchr(escape, c)) {
col++;
+ if (line[col] == NUL) {
+ return -1;
+ }
} else if (c == quotechar) {
break;
}
diff --git a/src/nvim/testdir/test_textobjects.vim b/src/nvim/testdir/test_textobjects.vim
index 2b6bb8b302..8f8dfdc46d 100644
--- a/src/nvim/testdir/test_textobjects.vim
+++ b/src/nvim/testdir/test_textobjects.vim
@@ -188,10 +188,18 @@ func Test_string_html_objects()
call assert_equal("<div><div\nattr=\"attr\"\n></div></div>", @", e)
set quoteescape&
+
+ " this was going beyond the end of the line
+ %del
+ sil! norm i"\
+ sil! norm i"\
+ sil! norm i"\
+ call assert_equal('"\', getline(1))
+
+ bwipe!
endfor
set enc=utf-8
- bwipe!
endfunc
func Test_empty_html_tag()