diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-12-13 15:08:56 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-12-13 15:08:56 +0100 |
| commit | a98849670674264de699d7ab22ae4b9b32e78f4a (patch) | |
| tree | 99ac0a3b5a592f81d937282e960890f00e4b7b89 | |
| parent | 099fdde0f073315b7f2700786ae533d23a556348 (diff) | |
patch 7.4.972v7.4.972
Problem: Memory leak when there is an error in setting an option.
Solution: Free the saved value (Christian Brabandt)
| -rw-r--r-- | src/option.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c index 3f98f47b85..0c38de6896 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 14365945de..8a4eddaab1 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 972, +/**/ 971, /**/ 970, |