diff options
| -rw-r--r-- | src/nvim/fold.c | 6 | ||||
| -rw-r--r-- | src/nvim/testdir/test_fold.vim | 10 | ||||
| -rw-r--r-- | src/nvim/version.c | 14 |
3 files changed, 27 insertions, 3 deletions
diff --git a/src/nvim/fold.c b/src/nvim/fold.c index 96968a5d49..24a73a5b9f 100644 --- a/src/nvim/fold.c +++ b/src/nvim/fold.c @@ -616,7 +616,11 @@ void foldCreate(win_T *wp, pos_T start, pos_T end) break; } } - i = (int)(fp - (fold_T *)gap->ga_data); + if (gap->ga_len == 0) { + i = 0; + } else { + i = (int)(fp - (fold_T *)gap->ga_data); + } } ga_grow(gap, 1); diff --git a/src/nvim/testdir/test_fold.vim b/src/nvim/testdir/test_fold.vim index e4baa34e4a..3c90c45952 100644 --- a/src/nvim/testdir/test_fold.vim +++ b/src/nvim/testdir/test_fold.vim @@ -805,4 +805,14 @@ func Test_move_no_folds() bwipe! endfunc +" this was crashing +func Test_fold_create_delete_create() + new + fold + fold + normal zd + fold + bwipe! +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/nvim/version.c b/src/nvim/version.c index 32cb0091a3..7296c74109 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -1970,11 +1970,21 @@ bool has_nvim_version(const char *const version_str) /// /// @return true if patch `n` has been included. bool has_vim_patch(int n) + FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT { - for (int i = 0; included_patches[i] != 0; i++) { - if (included_patches[i] == n) { + // Perform a binary search. + int l = 0; + int h = (int)(ARRAY_SIZE(included_patches)) - 1; + while (l < h) { + const int m = (l + h) / 2; + if (included_patches[m] == n) { return true; } + if (included_patches[m] < n) { + h = m; + } else { + l = m + 1; + } } return false; } |