summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-06-24 22:17:32 +0200
committerBram Moolenaar <bram@vim.org>2013-06-24 22:17:32 +0200
commitee30d60309eedd66c22980cb045c15b38ba657cd (patch)
tree3f0de1fc9fe1af7f09c1ef8922f50ba0092ed31c
parent7c60f25c119b2e3a1164e728ebca9dd9189a7e8b (diff)
downloadvim-ee30d60309eedd66c22980cb045c15b38ba657cd.tar.gz
updated for version 7.3.1240v7.3.1240v7-3-1240
Problem: Memory leak in findfile(). Solution: Free the memory. (Christian Brabandt)
-rw-r--r--src/eval.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c
index c37075ba..19b4479b 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 203daed5..8bebdde1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1240,
+/**/
1239,
/**/
1238,