thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

updated for version 7.3.390

Browse Source 
Problem:    Using NULL buffer pointer in a window.
Solution:   Check for w_buffer being NULL in more places. (Bjorn Winckler)
This commit is contained in:
Bram Moolenaar 2011-12-30 15:01:59 +01:00
parent 5d6f75e17e
commit fc57380c3f
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ex_cmds.c
View File

@ -3390,6 +3390,13 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags, oldwin)
(flags & ECMD_HIDE) ? 0 : DOBUF_UNLOAD); (flags & ECMD_HIDE) ? 0 : DOBUF_UNLOAD);
#ifdef FEAT_AUTOCMD #ifdef FEAT_AUTOCMD
/* Autocommands may open a new window and leave oldwin open
* which leads to crashes since the above call sets
* oldwin->w_buffer to NULL. */
if (curwin != oldwin && oldwin != aucmd_win
&& win_valid(oldwin) && oldwin->w_buffer == NULL)
win_close(oldwin, FALSE);
# ifdef FEAT_EVAL # ifdef FEAT_EVAL
if (aborting()) /* autocmds may abort script processing */ if (aborting()) /* autocmds may abort script processing */
{ {

8
src/quickfix.c
View File

@ -2675,7 +2675,7 @@ qf_fill_buffer(qi)
bt_quickfix(buf) bt_quickfix(buf)
buf_T *buf; buf_T *buf;
{ {
return (buf->b_p_bt[0] == 'q'); return buf != NULL && buf->b_p_bt[0] == 'q';
} }
/* /*
@ -2686,8 +2686,8 @@ bt_quickfix(buf)
bt_nofile(buf) bt_nofile(buf)
buf_T *buf; buf_T *buf;
{ {
return (buf->b_p_bt[0] == 'n' && buf->b_p_bt[2] == 'f') return buf != NULL && ((buf->b_p_bt[0] == 'n' && buf->b_p_bt[2] == 'f')
|| buf->b_p_bt[0] == 'a'; || buf->b_p_bt[0] == 'a');
} }
/* /*
@ -2697,7 +2697,7 @@ bt_nofile(buf)
bt_dontwrite(buf) bt_dontwrite(buf)
buf_T *buf; buf_T *buf;
{ {
return (buf->b_p_bt[0] == 'n'); return buf != NULL && buf->b_p_bt[0] == 'n';
} }
int int

2
src/version.c
View File

@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
390,
/**/ /**/
389, 389,
/**/ /**/

8
src/window.c
View File

@ -2170,7 +2170,7 @@ win_close(win, free_buf)
/* When closing the help window, try restoring a snapshot after closing /* When closing the help window, try restoring a snapshot after closing
* the window. Otherwise clear the snapshot, it's now invalid. */ * the window. Otherwise clear the snapshot, it's now invalid. */
if (win->w_buffer->b_help) if (win->w_buffer != NULL && win->w_buffer->b_help)
help_window = TRUE; help_window = TRUE;
else else
clear_snapshot(curtab, SNAP_HELP_IDX); clear_snapshot(curtab, SNAP_HELP_IDX);
@ -2214,13 +2214,15 @@ win_close(win, free_buf)
#ifdef FEAT_SYN_HL #ifdef FEAT_SYN_HL
/* Free independent synblock before the buffer is freed. */ /* Free independent synblock before the buffer is freed. */
reset_synblock(win); if (win->w_buffer != NULL)
reset_synblock(win);
#endif #endif
/* /*
* Close the link to the buffer. * Close the link to the buffer.
*/ */
close_buffer(win, win->w_buffer, free_buf ? DOBUF_UNLOAD : 0); if (win->w_buffer != NULL)
close_buffer(win, win->w_buffer, free_buf ? DOBUF_UNLOAD : 0);
/* Autocommands may have closed the window already, or closed the only /* Autocommands may have closed the window already, or closed the only
* other window or moved to another tab page. */ * other window or moved to another tab page. */