diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-11-28 15:25:34 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-11-28 15:25:34 +0100 |
| commit | c83a44bf8f963ac1b3eb9a4dc76cb9c1a33809b0 (patch) | |
| tree | 843a97d7458fbeb2c9e8b9534fd1ed7136fb6db9 /src | |
| parent | ff8cf2be6668d6e4091941659e84ee13f0f13542 (diff) | |
| download | vim-git-c83a44bf8f963ac1b3eb9a4dc76cb9c1a33809b0.tar.gz | |
updated for version 7.3.730v7.3.730
Problem: Crash in PHP file when using syntastic. (Ike Devolder)
Solution: Avoid using NULL pointer. (Christian Brabandt)
Diffstat (limited to 'src')
| -rw-r--r-- | src/quickfix.c | 15 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 9 deletions
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; } diff --git a/src/version.c b/src/version.c index 23d9c07ba..8163dbe04 100644 --- a/src/version.c +++ b/src/version.c @@ -726,6 +726,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 730, +/**/ 729, /**/ 728, |