summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-12-20 17:59:53 +0100
committerBram Moolenaar <Bram@vim.org>2020-12-20 17:59:53 +0100
commit61e07b2394e12f757160cac421ec5c45dc4c074d (patch)
tree94a7ca36327ff69316500ae0cdb87195a5d49187
parentf112f30a82f17114d8b08a0fb90928cd19440581 (diff)
downloadvim-git-61e07b2394e12f757160cac421ec5c45dc4c074d.tar.gz
patch 8.2.2171: valgrind warning for using uninitialized valuev8.2.2171
Problem: Valgrind warning for using uninitialized value. Solution: Do not use "startp" or "endp" unless there is a match.
-rw-r--r--src/regexp_nfa.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index da80ee921..cbfed49b5 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -7236,7 +7236,7 @@ theend:
|| (end->lnum == start->lnum && end->col < start->col))
rex.reg_mmatch->endpos[0] = rex.reg_mmatch->startpos[0];
}
- else
+ 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];
diff --git a/src/version.c b/src/version.c
index 6e2e6abc5..d149c9b3f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2171,
+/**/
2170,
/**/
2169,