Mercurial > vim
changeset 10379:73e2a7abe2a3 v8.0.0084
commit https://github.com/vim/vim/commit/7618e00d3b8bfe064cfc524640d754607361f9df
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Nov 13 15:09:26 2016 +0100
patch 8.0.0084
Problem: Using freed memory when adding to a quickfix list. (Domenique
Pelle)
Solution: Clear the directory name.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 13 Nov 2016 15:15:03 +0100 |
| parents | e0c401329563 |
| children | 5e502f83c562 |
| files | src/quickfix.c src/testdir/test_quickfix.vim src/version.c |
| diffstat | 3 files changed, 27 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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; } /*
--- 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