diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-07-06 16:39:47 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-07-06 16:39:47 +0200 |
| commit | 756287da38076a25fda0ecb75254ef75afb9c931 (patch) | |
| tree | 57f293c716b62e4c394d2229fe4896f381658106 | |
| parent | e25865a7f32d9e6feab0b6b61b76f074ee16f0c9 (diff) | |
| download | vim-git-756287da38076a25fda0ecb75254ef75afb9c931.tar.gz | |
updated for version 7.3.588v7.3.588
Problem: Crash on NULL pointer.
Solution: Fix the immediate problem by checking for NULL. (Lech Lorens)
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/window.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/version.c b/src/version.c index 1314e41e6..2676fa7fc 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 588, +/**/ 587, /**/ 586, diff --git a/src/window.c b/src/window.c index cf45e90b0..c65f49d79 100644 --- a/src/window.c +++ b/src/window.c @@ -2184,7 +2184,7 @@ win_close(win, free_buf) } #ifdef FEAT_AUTOCMD - if (win->w_closing || win->w_buffer->b_closing) + if (win->w_closing || (win->w_buffer != NULL && win->w_buffer->b_closing)) return; /* window is already being closed */ if (win == aucmd_win) { @@ -3723,7 +3723,7 @@ leave_tabpage(new_curbuf) enter_tabpage(tp, old_curbuf, trigger_autocmds) tabpage_T *tp; buf_T *old_curbuf UNUSED; - int trigger_autocmds UNUSED; + int trigger_autocmds UNUSED; { int old_off = tp->tp_firstwin->w_winrow; win_T *next_prevwin = tp->tp_prevwin; @@ -3868,7 +3868,7 @@ goto_tabpage(n) void goto_tabpage_tp(tp, trigger_autocmds) tabpage_T *tp; - int trigger_autocmds; + int trigger_autocmds; { /* Don't repeat a message in another tab page. */ set_keep_msg(NULL, 0); |