patch 7.4.1592
Problem: Quickfix code using memory after being freed. (Dominique Pelle)
Solution: Detect that the window was closed. (Hirohito Higashi)
diff --git a/src/quickfix.c b/src/quickfix.c
index 8dfad2e..2a96240 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -1795,8 +1795,19 @@
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 @@
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 @@
}
}
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)
{