diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-03-18 23:11:04 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-03-18 23:11:04 +0100 |
| commit | f79225ed4f81bc579bb3360ad2eb06adc8058153 (patch) | |
| tree | 033d970c0e0f3ccb062e36fbf3582fa8413ed165 | |
| parent | 2c90d51123fba44a90e09aa4a4f2b7d972dadb94 (diff) | |
patch 8.0.0483: illegal memory access when using :allv8.0.0483
Problem: Illegal memory access when using :all. (Dominique Pelle)
Solution: Adjust the cursor position right after setting "curwin".
| -rw-r--r-- | src/testdir/test_window_cmd.vim | 12 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/window.c | 4 |
3 files changed, 18 insertions, 0 deletions
diff --git a/src/testdir/test_window_cmd.vim b/src/testdir/test_window_cmd.vim index 569a78a0ed..6c9ddc289a 100644 --- a/src/testdir/test_window_cmd.vim +++ b/src/testdir/test_window_cmd.vim @@ -67,4 +67,16 @@ function Test_window_cmd_wincmd_gf() augroup! test_window_cmd_wincmd_gf endfunc +func Test_next_split_all() + " This was causing an illegal memory access. + n x + norm axxx + split + split + s/x + s/x + all + bwipe! +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index 828450d171..bb4cadcd9a 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 483, +/**/ 482, /**/ 481, diff --git a/src/window.c b/src/window.c index 06f97de272..d0dff69e0a 100644 --- a/src/window.c +++ b/src/window.c @@ -2450,6 +2450,10 @@ win_close(win_T *win, int free_buf) #endif curbuf = curwin->w_buffer; close_curwin = TRUE; + + /* The cursor position may be invalid if the buffer changed after last + * using the window. */ + check_cursor(); } if (p_ea && (*p_ead == 'b' || *p_ead == dir)) win_equal(curwin, TRUE, dir); |