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

patch 7.4.1704

Browse Source 
Problem:    Using freed memory with "wincmd p". (Dominique Pelle)
Solution:   Also clear "prevwin" in other tab pages.
This commit is contained in:
Bram Moolenaar
2016-04-03 21:22:58 +02:00
parent b50e5f5686
commit 3dda7db4e1
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@@ -748,6 +748,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 */
/**/
1704,
/**/ /**/
1703, 1703,
/**/ /**/

13
src/window.c
View File

@@ -340,7 +340,7 @@ newwindow:
/* cursor to last accessed (previous) window */ /* cursor to last accessed (previous) window */
case 'p': case 'p':
case Ctrl_P: case Ctrl_P:
if (prevwin == NULL) if (!win_valid(prevwin))
beep_flush(); beep_flush();
else else
win_goto(prevwin); win_goto(prevwin);
@@ -4577,8 +4577,15 @@ win_free(
unref_var_dict(wp->w_vars); unref_var_dict(wp->w_vars);
#endif #endif
if (prevwin == wp) {
prevwin = NULL; tabpage_T *ttp;
if (prevwin == wp)
prevwin = NULL;
for (ttp = first_tabpage; ttp != NULL; ttp = ttp->tp_next)
if (ttp->tp_prevwin == wp)
ttp->tp_prevwin = NULL;
}
win_free_lsize(wp); win_free_lsize(wp);
for (i = 0; i < wp->w_tagstacklen; ++i) for (i = 0; i < wp->w_tagstacklen; ++i)