From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 4 Jun 2019 17:16:29 +0000 (+0200)
Subject: patch 8.1.1463: gcc warns for uninitialized variable
X-Git-Tag: v8.1.1463
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=277e79adc4d2b62556ce8a3720684e4b3e1e6d42;p=vim

patch 8.1.1463: gcc warns for uninitialized variable

Problem:    Gcc warns for uninitialized variable.
Solution:   Put usage inside "if".  (Ken Takata)
---

diff --git a/src/textprop.c b/src/textprop.c
index 2d7567cdb..f219b925f 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1240,9 +1240,12 @@ join_prop_lines(
     if (line == NULL)
 	return;
     mch_memmove(line, newp, len);
-    l = oldproplen * sizeof(textprop_T);
-    mch_memmove(line + len, props, l);
-    len += l;
+    if (oldproplen > 0)
+    {
+	l = oldproplen * sizeof(textprop_T);
+	mch_memmove(line + len, props, l);
+	len += l;
+    }
 
     for (i = 0; i < count - 1; ++i)
 	if (prop_lines[i] != NULL)
diff --git a/src/version.c b/src/version.c
index ec6ee205d..7d86aaeb4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1463,
 /**/
     1462,
 /**/