diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-06-27 02:32:08 +0200 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2017-08-16 12:22:41 -0400 |
| commit | 1fb3339844b2244daaee9b44264137c8c6c67164 (patch) | |
| tree | 431620fef77af6978b6a8d5e3bc418a3759a5d8c /src | |
| parent | f0a9b7ff637b1c33988b8ec20530657ba71644fc (diff) | |
| download | rneovim-1fb3339844b2244daaee9b44264137c8c6c67164.tar.gz rneovim-1fb3339844b2244daaee9b44264137c8c6c67164.tar.bz2 rneovim-1fb3339844b2244daaee9b44264137c8c6c67164.zip | |
vim-patch:8.0.0679
Problem: Using freed memory.
Solution: Get the parent frame pointer earlier.
https://github.com/vim/vim/commit/41cc038ff83498c589c7d25b3d2984145528eb92
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/version.c | 2 | ||||
| -rw-r--r-- | src/nvim/window.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c index 80b8b03258..bd90f28629 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -273,7 +273,7 @@ static const int included_patches[] = { // 682, // 681, // 680, - // 679, + 679, 678, // 677, // 676, diff --git a/src/nvim/window.c b/src/nvim/window.c index 6a21844812..081fc98816 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -1878,7 +1878,7 @@ int win_close(win_T *win, int free_buf) int dir; int help_window = FALSE; tabpage_T *prev_curtab = curtab; - frame_T *win_frame = win->w_frame; + frame_T *win_frame = win->w_frame->fr_parent; if (last_window()) { EMSG(_("E444: Cannot close last window")); @@ -2030,7 +2030,7 @@ int win_close(win_T *win, int free_buf) if (p_ea && (*p_ead == 'b' || *p_ead == dir)) { // If the frame of the closed window contains the new current window, // only resize that frame. Otherwise resize all windows. - win_equal(curwin, curwin->w_frame->fr_parent == win_frame->fr_parent, dir); + win_equal(curwin, curwin->w_frame->fr_parent == win_frame, dir); } else { win_comp_pos(); } |