From a3d10a508c404a32485adc86284725e0bdc5b602 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 21 Dec 2020 18:24:00 +0100
Subject: patch 8.2.2181: valgrind warnings for using uninitialized value

Problem:    Valgrind warnings for using uninitialized value.
Solution:   Do not use "start" or "end" unless there is a match.
---
 src/regexp_bt.c  | 27 +++++++++++++++------------
 src/regexp_nfa.c | 27 +++++++++++++++------------
 src/version.c    |  2 ++
 3 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/src/regexp_bt.c b/src/regexp_bt.c
index 476f34ef4..2960bad94 100644
--- a/src/regexp_bt.c
+++ b/src/regexp_bt.c
@@ -4805,21 +4805,24 @@ theend:
     if (backpos.ga_maxlen > BACKPOS_INITIAL)
 	ga_clear(&backpos);
 
-    // Make sure the end is never before the start.  Can happen when \zs and
-    // \ze are used.
-    if (REG_MULTI)
+    if (retval > 0)
     {
-	lpos_T *start = &rex.reg_mmatch->startpos[0];
-	lpos_T *end = &rex.reg_mmatch->endpos[0];
+	// Make sure the end is never before the start.  Can happen when \zs
+	// and \ze are used.
+	if (REG_MULTI)
+	{
+	    lpos_T *start = &rex.reg_mmatch->startpos[0];
+	    lpos_T *end = &rex.reg_mmatch->endpos[0];
 
-	if (end->lnum < start->lnum
+	    if (end->lnum < start->lnum
 			|| (end->lnum == start->lnum && end->col < start->col))
-	    rex.reg_mmatch->endpos[0] = rex.reg_mmatch->startpos[0];
-    }
-    else
-    {
-	if (rex.reg_match->endp[0] < rex.reg_match->startp[0])
-	    rex.reg_match->endp[0] = rex.reg_match->startp[0];
+		rex.reg_mmatch->endpos[0] = rex.reg_mmatch->startpos[0];
+	}
+	else
+	{
+	    if (rex.reg_match->endp[0] < rex.reg_match->startp[0])
+		rex.reg_match->endp[0] = rex.reg_match->startp[0];
+	}
     }
 
     return retval;
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 6182f58cd..ad47142d6 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -7227,21 +7227,24 @@ nfa_regexec_both(
 #endif
 
 theend:
-    // Make sure the end is never before the start.  Can happen when \zs and
-    // \ze are used.
-    if (REG_MULTI)
+    if (retval > 0)
     {
-	lpos_T *start = &rex.reg_mmatch->startpos[0];
-	lpos_T *end = &rex.reg_mmatch->endpos[0];
+	// Make sure the end is never before the start.  Can happen when \zs and
+	// \ze are used.
+	if (REG_MULTI)
+	{
+	    lpos_T *start = &rex.reg_mmatch->startpos[0];
+	    lpos_T *end = &rex.reg_mmatch->endpos[0];
 
-	if (end->lnum < start->lnum
+	    if (end->lnum < start->lnum
 			|| (end->lnum == start->lnum && end->col < start->col))
-	    rex.reg_mmatch->endpos[0] = rex.reg_mmatch->startpos[0];
-    }
-    else if (retval > 0)
-    {
-	if (rex.reg_match->endp[0] < rex.reg_match->startp[0])
-	    rex.reg_match->endp[0] = rex.reg_match->startp[0];
+		rex.reg_mmatch->endpos[0] = rex.reg_mmatch->startpos[0];
+	}
+	else
+	{
+	    if (rex.reg_match->endp[0] < rex.reg_match->startp[0])
+		rex.reg_match->endp[0] = rex.reg_match->startp[0];
+	}
     }
 
     return retval;
diff --git a/src/version.c b/src/version.c
index 07edd0c9e..04951e46d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2181,
 /**/
     2180,
 /**/
-- 
cgit v1.2.1