From: Bram Moolenaar Date: Sun, 13 Dec 2015 14:08:56 +0000 (+0100) Subject: patch 7.4.972 X-Git-Tag: v7.4.972 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a98849670674264de699d7ab22ae4b9b32e78f4a;p=vim patch 7.4.972 Problem: Memory leak when there is an error in setting an option. Solution: Free the saved value (Christian Brabandt) --- diff --git a/src/option.c b/src/option.c index 3f98f47b8..0c38de689 100644 --- a/src/option.c +++ b/src/option.c @@ -4970,7 +4970,12 @@ do_set(arg, opt_flags) /* If error detected, print the error message. */ if (errmsg != NULL) + { +#if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL) + vim_free(saved_origval); +#endif goto skip; + } #if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL) if (saved_origval != NULL) { diff --git a/src/version.c b/src/version.c index 14365945d..8a4eddaab 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 972, /**/ 971, /**/