From 9c24cd11e2048e16e25271a7a7dbef4593890a18 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 23 Oct 2020 15:40:39 +0200
Subject: [PATCH] patch 8.2.1892: valgrind warns for using uninitialized access
 in tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem:    Valgrind warns for using uninitialized access in tests.
Solution:   Fix condition for breaking out of loop. (Dominique Pellé,
            closes #7187)
---
 src/terminal.c | 3 ++-
 src/version.c  | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/terminal.c b/src/terminal.c
index 867a0e3f3b30a..049e2e7c3e6fd 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -4718,6 +4718,7 @@ f_term_dumpwrite(typval_T *argvars, typval_T *rettv UNUSED)
 	    {
 		int c = cell.chars[i];
 		int pc = prev_cell.chars[i];
+		int should_break = c == NUL || pc == NUL;
 
 		// For the first character NUL is the same as space.
 		if (i == 0)
@@ -4727,7 +4728,7 @@ f_term_dumpwrite(typval_T *argvars, typval_T *rettv UNUSED)
 		}
 		if (c != pc)
 		    same_chars = FALSE;
-		if (c == NUL || pc == NUL)
+		if (should_break)
 		    break;
 	    }
 	    same_attr = vtermAttr2hl(cell.attrs)
diff --git a/src/version.c b/src/version.c
index 4b27b16ec9daf..297d5b47b9bda 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 */
+/**/
+    1892,
 /**/
     1891,
 /**/