From cca74134564a99f638a583d79d2cfd3ca393673d Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 25 Sep 2013 21:00:28 +0200 Subject: [PATCH] updated for version 7.4.040 Problem: Valgrind error on exit when a script-local variable holds a reference to the scope of another script. Solution: First clear all variables, then free the scopes. (ZyX) --- src/eval.c | 7 ++++--- src/version.c | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/eval.c b/src/eval.c index 807efe25f..03e3735ce 100644 --- a/src/eval.c +++ b/src/eval.c @@ -915,12 +915,13 @@ eval_clear() /* autoloaded script names */ ga_clear_strings(&ga_loaded); - /* script-local variables */ + /* Script-local variables. First clear all the variables and in a second + * loop free the scriptvar_T, because a variable in one script might hold + * a reference to the whole scope of another script. */ for (i = 1; i <= ga_scripts.ga_len; ++i) - { vars_clear(&SCRIPT_VARS(i)); + for (i = 1; i <= ga_scripts.ga_len; ++i) vim_free(SCRIPT_SV(i)); - } ga_clear(&ga_scripts); /* unreferenced lists and dicts */ diff --git a/src/version.c b/src/version.c index 3495b0ee8..c7a2011c1 100644 --- a/src/version.c +++ b/src/version.c @@ -738,6 +738,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 40, /**/ 39, /**/ -- 2.50.1