From 81fcb67fb32a12414512b72e691a1bbbff9f8511 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 1 Sep 2020 21:21:24 +0200 Subject: 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 #6831, closes #6831) --- src/fold.c | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/fold.c b/src/fold.c index d95b46b5b4..5c55b0777b 100644 --- a/src/fold.c +++ b/src/fold.c @@ -3059,7 +3059,7 @@ truncate_fold(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 diff --git a/src/version.c b/src/version.c index 29f4363415..80c39982d3 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1561, /**/ 1560, /**/ -- cgit v1.2.3