From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 5 Oct 2021 20:58:53 +0000 (+0100)
Subject: patch 8.2.3482: reading beyond end of line ending in quote and backslash
X-Git-Tag: v8.2.3482
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78e0fa4cf4fcd563c0bc8c87afa54d4f5dc22020;p=vim

patch 8.2.3482: reading beyond end of line ending in quote and backslash

Problem:    Reading beyond end of line ending in quote and backslash.
Solution:   Check for non-NUL after backslash. (closes #8964)
---

diff --git a/src/cindent.c b/src/cindent.c
index b75120653..850a36994 100644
--- a/src/cindent.c
+++ b/src/cindent.c
@@ -82,10 +82,10 @@ skip_string(char_u *p)
     {
 	if (p[0] == '\'')		    // 'c' or '\n' or '\000'
 	{
-	    if (!p[1])			    // ' at end of line
+	    if (p[1] == NUL)		    // ' at end of line
 		break;
 	    i = 2;
-	    if (p[1] == '\\')		    // '\n' or '\000'
+	    if (p[1] == '\\' && p[2] != NUL)    // '\n' or '\000'
 	    {
 		++i;
 		while (vim_isdigit(p[i - 1]))   // '\000'
diff --git a/src/testdir/test_cindent.vim b/src/testdir/test_cindent.vim
index 5926408d2..3a536c4c8 100644
--- a/src/testdir/test_cindent.vim
+++ b/src/testdir/test_cindent.vim
@@ -5307,4 +5307,11 @@ func Test_cindent_pragma()
   enew! | close
 endfunc
 
+func Test_backslash_at_end_of_line()
+  new
+  exe "norm v>O'\\\<C-m>-"
+  exe "norm \<C-q>="
+  bwipe!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 31fb2a618..b0049e00f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3482,
 /**/
     3481,
 /**/