commit 7d3664df9008bd5f39f8a2555843d1b269946e4d
author Bram Moolenaar <Bram@vim.org> Sat May 09 13:06:24 2020 +0200
committer Bram Moolenaar <Bram@vim.org> Sat May 09 13:06:24 2020 +0200
tree e2566a0619969a3c98d159a124e4df3fec2627c5
parent 7d131b071539e73e4f8a1e6ffbb4d7bfc69a57ec

patch 8.2.0718: gcc warning for returning pointer to local variable

Problem:    Gcc warning for returning pointer to local variable. (John
            Marriott)
Solution:   Return another pointer.

src/evalvars.c

diff --git a/src/evalvars.c b/src/evalvars.c
index 08b2990..0935bb3 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -2510,6 +2510,7 @@
 	return NULL;
     if (len < sizeof(buffer) - 1)
     {
+	// avoid an alloc/free for short names
 	vim_strncpy(buffer, name, len);
 	p = buffer;
     }
@@ -2529,7 +2530,8 @@
 
     if (p != buffer)
 	vim_free(p);
-    return res;
+    // Don't return "buffer", gcc complains.
+    return res == NULL ? NULL : IObuff;
 }
 
 /*

src/version.c

diff --git a/src/version.c b/src/version.c
index ba81d68..5c54b42 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    718,
+/**/
     717,
 /**/
     716,