From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 4 Aug 2020 19:46:18 +0000 (+0200)
Subject: patch 8.2.1364: invalid memory access when searching for raw string
X-Git-Tag: v8.2.1364
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=282f9c64e570e832d3eba12950da15c9f1a40f06;p=vim

patch 8.2.1364: invalid memory access when searching for raw string

Problem:    Invalid memory access when searching for raw string.
Solution:   Check for delimiter match before following quote. (closes #6578)
---

diff --git a/src/search.c b/src/search.c
index 91a26dd36..7391ab0fb 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1928,8 +1928,8 @@ find_rawstring_end(char_u *linep, pos_T *startpos, pos_T *endpos)
 	{
 	    if (lnum == endpos->lnum && (colnr_T)(p - line) >= endpos->col)
 		break;
-	    if (*p == ')' && p[delim_len + 1] == '"'
-			  && STRNCMP(delim_copy, p + 1, delim_len) == 0)
+	    if (*p == ')' && STRNCMP(delim_copy, p + 1, delim_len) == 0
+			  && p[delim_len + 1] == '"')
 	    {
 		found = TRUE;
 		break;
diff --git a/src/version.c b/src/version.c
index 376c8fd64..366d3ab77 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1364,
 /**/
     1363,
 /**/