updated for version 7.3.730

Problem:    Crash in PHP file when using syntastic. (Ike Devolder)
Solution:   Avoid using NULL pointer. (Christian Brabandt)

diff --git a/src/quickfix.c b/src/quickfix.c
index 85da690fb3c2d2eb3313bc7e56d0c6995eed1e53..30a58458b44a4cbc918a433ca8609d9b5ff75263 100644 (file)
--- 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;
     }

diff --git a/src/version.c b/src/version.c
index 23d9c07ba85bdd57a4e77480fe07635613862fab..8163dbe04d2f84455b43693f3b93badc70c6fa8e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    730,
 /**/
     729,
 /**/