From cf1e0239ceec96396fa51f494e442c799ccd45fb Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 24 Nov 2021 15:13:26 +0000 Subject: 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/fold.c') diff --git a/src/fold.c b/src/fold.c index d9cba6a223..d4a6267539 100644 --- a/src/fold.c +++ b/src/fold.c @@ -307,7 +307,7 @@ foldedCount(win_T *win, linenr_T lnum, foldinfo_T *infop) 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 @@ foldmethodIsIndent(win_T *wp) 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 @@ foldmethodIsExpr(win_T *wp) 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 -- cgit v1.2.3