Permalink
Browse files

patch 8.0.0084

Problem:    Using freed memory when adding to a quickfix list. (Domenique
            Pelle)
Solution:   Clear the directory name.
  • Loading branch information...
1 parent 8e63905 commit 7618e00d3b8bfe064cfc524640d754607361f9df @brammool brammool committed Nov 13, 2016
Showing with 27 additions and 1 deletion.
  1. +3 −1 src/quickfix.c
  2. +22 −0 src/testdir/test_quickfix.vim
  3. +2 −0 src/version.c
View
@@ -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;
}
/*
@@ -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
View
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 84,
+/**/
83,
/**/
82,

0 comments on commit 7618e00

Please sign in to comment.