diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-02-19 21:07:04 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-02-19 21:07:04 +0100 |
| commit | 673911457d6745b6b779eb769c2f41965592d12c (patch) | |
| tree | 2bfcf65d74bce58f310c25cd68f17e41ac620fe7 /src/option.c | |
| parent | d56a79d3396cf70861b7f739a3c400db91ce7b70 (diff) | |
| download | vim-git-673911457d6745b6b779eb769c2f41965592d12c.tar.gz | |
patch 8.0.0342: double free with EXITFREE and setting 'ttytype'v8.0.0342
Problem: Double free when compiled with EXITFREE and setting 'ttytype'.
Solution: Avoid setting P_ALLOCED on 'ttytype'. (Dominique Pelle,
closes #1461)
Diffstat (limited to 'src/option.c')
| -rw-r--r-- | src/option.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/option.c b/src/option.c index b5f3a9a86..48a8048cb 100644 --- a/src/option.c +++ b/src/option.c @@ -3775,7 +3775,7 @@ free_all_options(void) if (options[i].indir == PV_NONE) { /* global option: free value and default value. */ - if (options[i].flags & P_ALLOCED && options[i].var != NULL) + if ((options[i].flags & P_ALLOCED) && options[i].var != NULL) free_string_option(*(char_u **)options[i].var); if (options[i].flags & P_DEF_ALLOCED) free_string_option(options[i].def_val[VI_DEFAULT]); @@ -5929,8 +5929,14 @@ did_set_string_option( else if (set_termname(T_NAME) == FAIL) errmsg = (char_u *)N_("E522: Not found in termcap"); else + { /* Screen colors may have changed. */ redraw_later_clear(); + + /* Both 'term' and 'ttytype' point to T_NAME, only set the + * P_ALLOCED flag on 'term'. */ + opt_idx = findoption((char_u *)"term"); + } } /* 'backupcopy' */ |