Mercurial > vim
changeset 8605:536b9b88d1ca v7.4.1592
commit https://github.com/vim/vim/commit/0899d698030ec076eb26352cda1ea334ab0819d9
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Mar 19 13:35:03 2016 +0100
patch 7.4.1592
Problem: Quickfix code using memory after being freed. (Dominique Pelle)
Solution: Detect that the window was closed. (Hirohito Higashi)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 19 Mar 2016 13:45:04 +0100 |
| parents | 35916dba9326 |
| children | 93cd67687c88 |
| files | src/quickfix.c src/testdir/test_quickfix.vim src/version.c |
| diffstat | 3 files changed, 38 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/quickfix.c +++ b/src/quickfix.c @@ -1795,8 +1795,19 @@ win_found: oldwin == curwin ? curwin : NULL); } else + { ok = buflist_getfile(qf_ptr->qf_fnum, (linenr_T)1, GETF_SETMARK | GETF_SWITCH, forceit); + if (qi != &ql_info && !win_valid(oldwin)) + { + EMSG(_("E924: Current window was closed")); + ok = FALSE; + qi = NULL; + qf_ptr = NULL; + opened_window = FALSE; + } + } + } if (ok == OK) @@ -1899,7 +1910,7 @@ win_found: if (opened_window) win_close(curwin, TRUE); /* Close opened window */ #endif - if (qf_ptr->qf_fnum != 0) + if (qf_ptr != NULL && qf_ptr->qf_fnum != 0) { /* * Couldn't open file, so put index back where it was. This could @@ -1913,8 +1924,11 @@ failed: } } theend: - qi->qf_lists[qi->qf_curlist].qf_ptr = qf_ptr; - qi->qf_lists[qi->qf_curlist].qf_index = qf_index; + if (qi != NULL) + { + qi->qf_lists[qi->qf_curlist].qf_ptr = qf_ptr; + qi->qf_lists[qi->qf_curlist].qf_index = qf_index; + } #ifdef FEAT_WINDOWS if (p_swb != old_swb && opened_window) {
--- a/src/testdir/test_quickfix.vim +++ b/src/testdir/test_quickfix.vim @@ -495,3 +495,22 @@ function Test_locationlist() augroup! testgroup endfunction + +function Test_locationlist_curwin_was_closed() + augroup testgroup + au! + autocmd BufReadCmd t call R(expand("<amatch>")) + augroup END + + function R(n) + quit + endfunc + + new + let q = [] + call add(q, {'filename': 't' }) + call setloclist(0, q) + call assert_fails('lrewind', 'E924:') + + augroup! testgroup +endfunction