From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 3 Nov 2020 19:05:40 +0000 (+0100)
Subject: patch 8.2.1947: crash when using "zj" without folds
X-Git-Tag: v8.2.1947
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c136a3528b7ebb825c3863d701af44f023381181;p=vim

patch 8.2.1947: crash when using "zj" without folds

Problem:    Crash when using "zj" without folds. (Sean Dewar)
Solution:   Check for at least one fold. (closes #7245)
---

diff --git a/src/fold.c b/src/fold.c
index 8a904f64c..4b4e61829 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 62244640b..f0bd6e481 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 3f2affe3b..015cf4cb1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1947,
 /**/
     1946,
 /**/