From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 24 Jun 2013 20:17:32 +0000 (+0200)
Subject: updated for version 7.3.1240
X-Git-Tag: v7.3.1240
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df2bc27b52944fbb75b8203a22f3ebde172e9c79;p=vim

updated for version 7.3.1240
Problem:    Memory leak in findfile().
Solution:   Free the memory. (Christian Brabandt)
---

diff --git a/src/eval.c b/src/eval.c
index c37075ba1..19b4479b6 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -10448,7 +10448,7 @@ findfilendir(argvars, rettv, find_what)
     {
 	do
 	{
-	    if (rettv->v_type == VAR_STRING)
+	    if (rettv->v_type == VAR_STRING || rettv->v_type == VAR_LIST)
 		vim_free(fresult);
 	    fresult = find_file_in_path_option(first ? fname : NULL,
 					       first ? (int)STRLEN(fname) : 0,
diff --git a/src/version.c b/src/version.c
index 203daed52..8bebdde19 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1240,
 /**/
     1239,
 /**/