commit cf1e0239ceec96396fa51f494e442c799ccd45fb
author Bram Moolenaar <Bram@vim.org> Wed Nov 24 15:13:26 2021 +0000
committer Bram Moolenaar <Bram@vim.org> Wed Nov 24 15:13:26 2021 +0000
tree 1fc7696831f8f61c9863b43ef7573291a2bb9bdb
parent 8bc07e800c2af36686aadd4178cc2671f5c454d4

patch 8.2.3662: illegal memory access if malloc() fails

Problem:    Illegal memory access if malloc() fails.
Solution:   Check 'foldmethod' is not empty. (closes #9207)

src/fold.c

diff --git a/src/fold.c b/src/fold.c
index d9cba6a..d4a6267 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -307,7 +307,7 @@
     int
 foldmethodIsManual(win_T *wp)
 {
-    return (wp->w_p_fdm[3] == 'u');
+    return (wp->w_p_fdm[0] != NUL && wp->w_p_fdm[3] == 'u');
 }
 
 // foldmethodIsIndent() {{{2
@@ -327,7 +327,7 @@
     int
 foldmethodIsExpr(win_T *wp)
 {
-    return (wp->w_p_fdm[1] == 'x');
+    return (wp->w_p_fdm[0] != NUL && wp->w_p_fdm[1] == 'x');
 }
 
 // foldmethodIsMarker() {{{2
@@ -337,7 +337,7 @@
     int
 foldmethodIsMarker(win_T *wp)
 {
-    return (wp->w_p_fdm[2] == 'r');
+    return (wp->w_p_fdm[0] != NUL && wp->w_p_fdm[2] == 'r');
 }
 
 // foldmethodIsSyntax() {{{2

src/version.c

diff --git a/src/version.c b/src/version.c
index 1a39190..58a1856 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3662,
+/**/
     3661,
 /**/
     3660,