mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-08 12:28:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0194: possibly use of NULL pointer

Browse Source 
Problem:    Possibly use of NULL pointer. (Coverity)
Solution:   Reset the re_in_use flag earlier.
414998023f
This commit is contained in:
Jan Edmund Lazo
2020-07-25 01:34:07 -04:00
parent 1ab1de7845
commit ca698250fc
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/regexp.c
View File

@@ -7279,6 +7279,7 @@ static bool vim_regexec_string(regmatch_T *rmp, char_u *line, colnr_T col,
rex.reg_endpos = NULL; rex.reg_endpos = NULL;
int result = rmp->regprog->engine->regexec_nl(rmp, line, col, nl); int result = rmp->regprog->engine->regexec_nl(rmp, line, col, nl);
rmp->regprog->re_in_use = false;
// NFA engine aborted because it's very slow, use backtracking engine instead. // NFA engine aborted because it's very slow, use backtracking engine instead.
if (rmp->regprog->re_engine == AUTOMATIC_ENGINE if (rmp->regprog->re_engine == AUTOMATIC_ENGINE
@@ -7292,7 +7293,9 @@ static bool vim_regexec_string(regmatch_T *rmp, char_u *line, colnr_T col,
report_re_switch(pat); report_re_switch(pat);
rmp->regprog = vim_regcomp(pat, re_flags); rmp->regprog = vim_regcomp(pat, re_flags);
if (rmp->regprog != NULL) { if (rmp->regprog != NULL) {
rmp->regprog->re_in_use = true;
result = rmp->regprog->engine->regexec_nl(rmp, line, col, nl); result = rmp->regprog->engine->regexec_nl(rmp, line, col, nl);
rmp->regprog->re_in_use = false;
} }
xfree(pat); xfree(pat);
@@ -7303,7 +7306,6 @@ static bool vim_regexec_string(regmatch_T *rmp, char_u *line, colnr_T col,
if (rex_in_use) { if (rex_in_use) {
rex = rex_save; rex = rex_save;
} }
rmp->regprog->re_in_use = false;
return result > 0; return result > 0;
} }
@@ -7369,6 +7371,7 @@ long vim_regexec_multi(
int result = rmp->regprog->engine->regexec_multi(rmp, win, buf, lnum, col, int result = rmp->regprog->engine->regexec_multi(rmp, win, buf, lnum, col,
tm, timed_out); tm, timed_out);
rmp->regprog->re_in_use = false;
// NFA engine aborted because it's very slow, use backtracking engine instead. // NFA engine aborted because it's very slow, use backtracking engine instead.
if (rmp->regprog->re_engine == AUTOMATIC_ENGINE if (rmp->regprog->re_engine == AUTOMATIC_ENGINE
@@ -7387,8 +7390,10 @@ long vim_regexec_multi(
reg_do_extmatch = 0; reg_do_extmatch = 0;
if (rmp->regprog != NULL) { if (rmp->regprog != NULL) {
rmp->regprog->re_in_use = true;
result = rmp->regprog->engine->regexec_multi(rmp, win, buf, lnum, col, result = rmp->regprog->engine->regexec_multi(rmp, win, buf, lnum, col,
tm, timed_out); tm, timed_out);
rmp->regprog->re_in_use = false;
} }
xfree(pat); xfree(pat);
@@ -7399,7 +7404,6 @@ long vim_regexec_multi(
if (rex_in_use) { if (rex_in_use) {
rex = rex_save; rex = rex_save;
} }
rmp->regprog->re_in_use = false;
return result <= 0 ? 0 : result; return result <= 0 ? 0 : result;
} }