diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-02-10 22:59:04 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-02-10 22:59:04 +0100 |
commit | eeb1b9c7ed33c152e041a286d79bf3ed00d80e40 (patch) | |
tree | 49dacb9aef73142cd53860053bdf2e00f82ddf4f /src/quickfix.c | |
parent | d77aa4d22e943998c337d5a603622ac5cf2928cb (diff) |
patch 8.1.0892: failure when closing a window when location list is in usev8.1.0892
Problem: Failure when closing a window when location list is in use.
Solution: Handle the situation gracefully. Make sure memory for 'switchbuf'
is not freed at the wrong time. (Yegappan Lakshmanan,
closes #3928)
Diffstat (limited to 'src/quickfix.c')
-rw-r--r-- | src/quickfix.c | 62 |
1 files changed, 36 insertions, 26 deletions
diff --git a/src/quickfix.c b/src/quickfix.c index dba6b63bbe..ea2e8c9d18 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -1899,23 +1899,24 @@ ll_free_all(qf_info_T **pqi) return; *pqi = NULL; // Remove reference to this list + // If the location list is still in use, then queue the delete request + // to be processed later. + if (quickfix_busy > 0) + { + locstack_queue_delreq(qi); + return; + } + qi->qf_refcount--; if (qi->qf_refcount < 1) { // No references to this location list. - // If the location list is still in use, then queue the delete request - // to be processed later. - if (quickfix_busy > 0) - locstack_queue_delreq(qi); - else - { - // If the quickfix window buffer is loaded, then wipe it - wipe_qf_buffer(qi); + // If the quickfix window buffer is loaded, then wipe it + wipe_qf_buffer(qi); - for (i = 0; i < qi->qf_listcount; ++i) - qf_free(&qi->qf_lists[i]); - vim_free(qi); - } + for (i = 0; i < qi->qf_listcount; ++i) + qf_free(&qi->qf_lists[i]); + vim_free(qi); } } @@ -3018,7 +3019,7 @@ qf_jump_edit_buffer( qf_info_T *qi, qfline_T *qf_ptr, int forceit, - win_T *oldwin, + int prev_winid, int *opened_window) { qf_list_T *qfl = &qi->qf_lists[qi->qf_curlist]; @@ -3039,7 +3040,7 @@ qf_jump_edit_buffer( retval = do_ecmd(qf_ptr->qf_fnum, NULL, NULL, NULL, (linenr_T)1, ECMD_HIDE + ECMD_SET_HELP, - oldwin == curwin ? curwin : NULL); + prev_winid == curwin->w_id ? curwin : NULL); } else retval = buflist_getfile(qf_ptr->qf_fnum, @@ -3047,11 +3048,15 @@ qf_jump_edit_buffer( // If a location list, check whether the associated window is still // present. - if (qfl_type == QFLT_LOCATION && !win_valid_any_tab(oldwin)) + if (qfl_type == QFLT_LOCATION) { - emsg(_("E924: Current window was closed")); - *opened_window = FALSE; - return NOTDONE; + win_T *wp = win_id2wp(prev_winid); + if (wp == NULL && curwin->w_llist != qi) + { + emsg(_("E924: Current window was closed")); + *opened_window = FALSE; + return NOTDONE; + } } if (qfl_type == QFLT_QUICKFIX && !qflist_valid(NULL, save_qfid)) @@ -3211,7 +3216,7 @@ qf_jump_to_buffer( int qf_index, qfline_T *qf_ptr, int forceit, - win_T *oldwin, + int prev_winid, int *opened_window, int openfold, int print_message) @@ -3227,7 +3232,7 @@ qf_jump_to_buffer( if (qf_ptr->qf_fnum != 0) { - retval = qf_jump_edit_buffer(qi, qf_ptr, forceit, oldwin, + retval = qf_jump_edit_buffer(qi, qf_ptr, forceit, prev_winid, opened_window); if (retval != OK) return retval; @@ -3287,8 +3292,8 @@ qf_jump_newwin(qf_info_T *qi, int old_qf_index; char_u *old_swb = p_swb; unsigned old_swb_flags = swb_flags; + int prev_winid; int opened_window = FALSE; - win_T *oldwin = curwin; int print_message = TRUE; #ifdef FEAT_FOLDING int old_KeyTyped = KeyTyped; // getting file may reset it @@ -3304,6 +3309,8 @@ qf_jump_newwin(qf_info_T *qi, return; } + incr_quickfix_busy(); + qfl = &qi->qf_lists[qi->qf_curlist]; qf_ptr = qfl->qf_ptr; @@ -3325,13 +3332,15 @@ qf_jump_newwin(qf_info_T *qi, // window print_message = FALSE; + prev_winid = curwin->w_id; + retval = qf_jump_open_window(qi, qf_ptr, newwin, &opened_window); if (retval == FAIL) goto failed; if (retval == NOTDONE) goto theend; - retval = qf_jump_to_buffer(qi, qf_index, qf_ptr, forceit, oldwin, + retval = qf_jump_to_buffer(qi, qf_index, qf_ptr, forceit, prev_winid, &opened_window, old_KeyTyped, print_message); if (retval == NOTDONE) { @@ -3359,7 +3368,7 @@ theend: qfl->qf_ptr = qf_ptr; qfl->qf_index = qf_index; } - if (p_swb != old_swb && opened_window) + if (p_swb != old_swb) { // Restore old 'switchbuf' value, but not when an autocommand or // modeline has changed the value. @@ -3371,6 +3380,7 @@ theend: else free_string_option(old_swb); } + decr_quickfix_busy(); } // Highlight attributes used for displaying entries from the quickfix list. @@ -4004,9 +4014,9 @@ qf_open_new_cwindow(qf_info_T *qi, int height) if (IS_LL_STACK(qi)) { // For the location list window, create a reference to the - // location list from the window 'win'. - curwin->w_llist_ref = win->w_llist; - win->w_llist->qf_refcount++; + // location list stack from the window 'win'. + curwin->w_llist_ref = qi; + qi->qf_refcount++; } if (oldwin != curwin) |