diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-11-03 20:05:40 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-11-03 20:05:40 +0100 |
| commit | c136a3528b7ebb825c3863d701af44f023381181 (patch) | |
| tree | 3578f565a084562a2c5c803a4820e33cdadbfbbc /src | |
| parent | 35efa22ff2b98126363098db9304796b5624f97f (diff) | |
patch 8.2.1947: crash when using "zj" without foldsv8.2.1947
Problem: Crash when using "zj" without folds. (Sean Dewar)
Solution: Check for at least one fold. (closes #7245)
Diffstat (limited to 'src')
| -rw-r--r-- | src/fold.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_fold.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 13 insertions, 0 deletions
diff --git a/src/fold.c b/src/fold.c index 8a904f64c6..4b4e618299 100644 --- a/src/fold.c +++ b/src/fold.c @@ -902,6 +902,8 @@ foldMoveTo( // that moves the cursor is used. lnum_off = 0; gap = &curwin->w_folds; + if (gap->ga_len == 0) + break; use_level = FALSE; maybe_small = FALSE; lnum_found = curwin->w_cursor.lnum; diff --git a/src/testdir/test_fold.vim b/src/testdir/test_fold.vim index 62244640bf..f0bd6e481d 100644 --- a/src/testdir/test_fold.vim +++ b/src/testdir/test_fold.vim @@ -835,4 +835,13 @@ func Test_undo_fold_deletion() bwipe! endfunc +" this was crashing +func Test_move_no_folds() + new + fold + setlocal fdm=expr + normal zj + bwipe! +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index 3f2affe3b4..015cf4cb17 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1947, +/**/ 1946, /**/ 1945, |