From c83a44bf8f963ac1b3eb9a4dc76cb9c1a33809b0 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 28 Nov 2012 15:25:34 +0100 Subject: updated for version 7.3.730 Problem: Crash in PHP file when using syntastic. (Ike Devolder) Solution: Avoid using NULL pointer. (Christian Brabandt) --- src/quickfix.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/quickfix.c') diff --git a/src/quickfix.c b/src/quickfix.c index 85da690fb..30a58458b 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -898,11 +898,7 @@ qf_new_list(qi, qf_title, wp) * way with ":grep'. */ while (qi->qf_listcount > qi->qf_curlist + 1) - { - if (wp != NULL && wp->w_llist == qi) - wp->w_llist = NULL; qf_free(qi, --qi->qf_listcount); - } /* * When the stack is full, remove to oldest entry @@ -910,8 +906,6 @@ qf_new_list(qi, qf_title, wp) */ if (qi->qf_listcount == LISTCOUNT) { - if (wp != NULL && wp->w_llist == qi) - wp->w_llist = NULL; qf_free(qi, 0); for (i = 1; i < LISTCOUNT; ++i) qi->qf_lists[i - 1] = qi->qf_lists[i]; @@ -2135,9 +2129,12 @@ qf_free(qi, idx) while (qi->qf_lists[idx].qf_count) { qfp = qi->qf_lists[idx].qf_start->qf_next; - vim_free(qi->qf_lists[idx].qf_start->qf_text); - vim_free(qi->qf_lists[idx].qf_start->qf_pattern); - vim_free(qi->qf_lists[idx].qf_start); + if (qi->qf_lists[idx].qf_title != NULL) + { + vim_free(qi->qf_lists[idx].qf_start->qf_text); + vim_free(qi->qf_lists[idx].qf_start->qf_pattern); + vim_free(qi->qf_lists[idx].qf_start); + } qi->qf_lists[idx].qf_start = qfp; --qi->qf_lists[idx].qf_count; } -- cgit v1.2.1