patch 8.2.1561: using NULL pointers in fold code

Problem:    Using NULL pointers in fold code.
Solution:   Avoid using a NULL pointer. (Dominique Pellé, closes #6831,
            closes #6831)

diff --git a/src/fold.c b/src/fold.c
index d95b46b5b4e4764e6498cf6f283e207d549158ac..5c55b0777b74fb91ffb0e976f21a8e597c526cf7 100644 (file)
--- 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 29f4363415f3a120d110f3e1781326bca9b2ae01..80c39982d312bd63d19c5441734186d853b16b15 100644 (file)
--- 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,
 /**/