diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-09-01 21:21:24 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-09-01 21:21:24 +0200 |
| commit | 81fcb67fb32a12414512b72e691a1bbbff9f8511 (patch) | |
| tree | 747185dbc68cd8766a53a8993570f05de992e711 | |
| parent | 9c2b06637b32742cac11bfd66b1a4e84583c6c2e (diff) | |
patch 8.2.1561: using NULL pointers in fold codev8.2.1561
Problem: Using NULL pointers in fold code.
Solution: Avoid using a NULL pointer. (Dominique Pellé, closes #6831,
closes #6831)
| -rw-r--r-- | src/fold.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
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 @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1561, +/**/ 1560, /**/ 1559, |