vim-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.
https://github.com/vim/vim/commit/a3d10a508c404a32485adc86284725e0bdc5b602

2 files changed, 28 insertions, 24 deletions

diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index 2878e73573..fb08cd2727 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -3605,19 +3605,21 @@ 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) {
-    const lpos_T *const start = &rex.reg_mmatch->startpos[0];
-    const lpos_T *const end = &rex.reg_mmatch->endpos[0];
+  if (retval > 0) {
+    // Make sure the end is never before the start.  Can happen when \zs
+    // and \ze are used.
+    if (REG_MULTI) {
+      const lpos_T *const start = &rex.reg_mmatch->startpos[0];
+      const lpos_T *const end = &rex.reg_mmatch->endpos[0];
 
-    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];
+      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];
+      }
     }
   }
 
diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c
index feb118833d..d38719f396 100644
--- a/src/nvim/regexp_nfa.c
+++ b/src/nvim/regexp_nfa.c
@@ -6594,19 +6594,21 @@ static long nfa_regexec_both(char_u *line, colnr_T startcol,
 #endif
 
 theend:
-  // Make sure the end is never before the start.  Can happen when \zs and
-  // \ze are used.
-  if (REG_MULTI) {
-    const lpos_T *const start = &rex.reg_mmatch->startpos[0];
-    const lpos_T *const end = &rex.reg_mmatch->endpos[0];
+  if (retval > 0) {
+    // Make sure the end is never before the start.  Can happen when \zs and
+    // \ze are used.
+    if (REG_MULTI) {
+      const lpos_T *const start = &rex.reg_mmatch->startpos[0];
+      const lpos_T *const end = &rex.reg_mmatch->endpos[0];
 
-    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];
+      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];
+      }
     }
   }