From cc64f2cc1dc90c6e2bc24ea1b72c2947fe701549 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Tue, 1 Sep 2020 21:02:54 -0400 Subject: vim-patch:8.2.1561: using NULL pointers in fold code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Problem: Using NULL pointers in fold code. Solution: Avoid using a NULL pointer. (Dominique Pellé, closes vim/vim#6831, closes vim/vim#6831) https://github.com/vim/vim/commit/81fcb67fb32a12414512b72e691a1bbbff9f8511 --- src/nvim/fold.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/nvim/fold.c b/src/nvim/fold.c index 2cbe43d5be..697d283cca 100644 --- a/src/nvim/fold.c +++ b/src/nvim/fold.c @@ -2742,7 +2742,8 @@ static void truncate_fold(win_T *const wp, fold_T *fp, linenr_T end) } #define FOLD_END(fp) ((fp)->fd_top + (fp)->fd_len - 1) -#define VALID_FOLD(fp, gap) ((fp) < ((fold_T *)(gap)->ga_data + (gap)->ga_len)) +#define VALID_FOLD(fp, gap) \ + ((gap)->ga_len > 0 && (fp) < ((fold_T *)(gap)->ga_data + (gap)->ga_len)) #define FOLD_INDEX(fp, gap) ((size_t)(fp - ((fold_T *)(gap)->ga_data))) void foldMoveRange( win_T *const wp, garray_T *gap, -- cgit