adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 8.2.3662: illegal memory access if malloc() fails

Browse Source 
Problem:    Illegal memory access if malloc() fails.
Solution:   Check 'foldmethod' is not empty. (closes #9207)
This commit is contained in:
Bram Moolenaar
2021-11-24 15:13:26 +00:00
parent 8bc07e800c
commit cf1e0239ce
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/fold.c
View File

@ -307,7 +307,7 @@ foldedCount(win_T *win, linenr_T lnum, foldinfo_T *infop)
int int
foldmethodIsManual(win_T *wp) 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 // foldmethodIsIndent() {{{2
@ -327,7 +327,7 @@ foldmethodIsIndent(win_T *wp)
int int
foldmethodIsExpr(win_T *wp) 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 // foldmethodIsMarker() {{{2
@ -337,7 +337,7 @@ foldmethodIsExpr(win_T *wp)
int int
foldmethodIsMarker(win_T *wp) 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 // foldmethodIsSyntax() {{{2

2
src/version.c
View File

@ -757,6 +757,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3662,
/**/ /**/
3661, 3661,
/**/ /**/