# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1589022903 -7200
# Node ID 74002d42dda0dc35eaf744b2beaf4c0c63d4059c
# Parent  c3bf737ec527e290ab2367e69f4dfadc4eb97baf
patch 8.2.0718: gcc warning for returning pointer to local variable

Commit: https://github.com/vim/vim/commit/7d3664df9008bd5f39f8a2555843d1b269946e4d
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat May 9 13:06:24 2020 +0200

    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.

diff --git a/src/evalvars.c b/src/evalvars.c
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -2510,6 +2510,7 @@ lookup_scriptvar(char_u *name, size_t le
 	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 @@ lookup_scriptvar(char_u *name, size_t le
 
     if (p != buffer)
 	vim_free(p);
-    return res;
+    // Don't return "buffer", gcc complains.
+    return res == NULL ? NULL : IObuff;
 }
 
 /*
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    718,
+/**/
     717,
 /**/
     716,