diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-11-13 15:09:26 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-11-13 15:09:26 +0100 |
| commit | 7618e00d3b8bfe064cfc524640d754607361f9df (patch) | |
| tree | 359ccc01609eaa42df4174fe21cc8710cf0c5276 | |
| parent | 8e639052638a9bb8c7dd6e3e10776b1218cec1a3 (diff) | |
patch 8.0.0084v8.0.0084
Problem: Using freed memory when adding to a quickfix list. (Domenique
Pelle)
Solution: Clear the directory name.
| -rw-r--r-- | src/quickfix.c | 4 | ||||
| -rw-r--r-- | src/testdir/test_quickfix.vim | 22 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 27 insertions, 1 deletions
diff --git a/src/quickfix.c b/src/quickfix.c index 58c4227b6a..df351634f5 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -1617,7 +1617,7 @@ static char_u *qf_last_bufname = NULL; static bufref_T qf_last_bufref = {NULL, 0}; /* - * Get buffer number for file "directory.fname". + * Get buffer number for file "directory/fname". * Also sets the b_has_qf_entry flag. */ static int @@ -2711,7 +2711,9 @@ qf_free(qf_info_T *qi, int idx) qi->qf_lists[idx].qf_index = 0; qf_clean_dir_stack(&qi->qf_dir_stack); + qi->qf_directory = NULL; qf_clean_dir_stack(&qi->qf_file_stack); + qi->qf_currfile = NULL; } /* diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim index 98afdb1593..13c1482dd2 100644 --- a/src/testdir/test_quickfix.vim +++ b/src/testdir/test_quickfix.vim @@ -1669,3 +1669,25 @@ func Test_caddexpr_wrong() call assert_fails('caddexpr ""', 'E376:') let &efm = save_efm endfunc + +func Test_dirstack_cleanup() + " This used to cause a memory access in freed memory. + let save_efm = &efm + lexpr '0' + lopen + fun X(c) + let save_efm=&efm + set efm=%D%f + if a:c == 'c' + caddexpr '::' + else + laddexpr ':0:0' + endif + let &efm=save_efm + endfun + call X('c') + call X('l') + call setqflist([], 'r') + caddbuffer + let &efm = save_efm +endfunc diff --git a/src/version.c b/src/version.c index c7f00a8764..c4013e790c 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 84, +/**/ 83, /**/ 82, |