Mercurial > vim
changeset 5237:647596ab1ae2 v7.4a.044
updated for version 7.4a.044
Problem: Test 96 sometimes fails.
Solution: Clear window from b_wininfo in win_free(). (Suggestion by
Yukihiro Nakadaira)
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Wed, 24 Jul 2013 17:51:57 +0200 |
parents | 7c3c540f15c3 |
children | a369ac56a506 |
files | src/version.c src/window.c |
diffstat | 2 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/version.c +++ b/src/version.c @@ -728,6 +728,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 44, +/**/ 43, /**/ 42,
--- a/src/window.c +++ b/src/window.c @@ -4518,7 +4518,7 @@ win_alloc(after, hidden) #if defined(FEAT_WINDOWS) || defined(PROTO) /* - * remove window 'wp' from the window list and free the structure + * Remove window 'wp' from the window list and free the structure. */ static void win_free(wp, tp) @@ -4526,6 +4526,8 @@ win_free(wp, tp) tabpage_T *tp; /* tab page "win" is in, NULL for current */ { int i; + buf_T *buf; + wininfo_T *wip; #ifdef FEAT_FOLDING clearFolding(wp); @@ -4586,6 +4588,13 @@ win_free(wp, tp) vim_free(wp->w_localdir); + /* Remove the window from the b_wininfo lists, it may happen that the + * freed memory is re-used for another window. */ + for (buf = firstbuf; buf != NULL; buf = buf->b_next) + for (wip = buf->b_wininfo; wip != NULL; wip = wip->wi_next) + if (wip->wi_win == wp) + wip->wi_win = NULL; + #ifdef FEAT_SEARCH_EXTRA clear_matches(wp); #endif