IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings: regexp.c: br_regcomp(): Np dereference: MI.

Browse Source 
Problem: Dereference of null pointer @ 1312.
         http://neovim.org/doc/reports/clang/report-b1d09a.html#EndPath

Diagnostic: Multithreading issue.
Rationale : Suggested error path contains two succesive calls to
            `regnext(scan)`, first of which returning nonnull, the
            second one returning null. This can only occur if global
            `reg_toolong` accesed in `regnext()` changes between the
            calls.
Resolution: Use local variable to cache first `regnext(scan)` result.
            Note that this change alters function semantics, as now
            function only issues one call instead of two, reusing the
            result for the second time.
            This shouldn't be a problem, though, as new semantics should
            be in fact be better.
This commit is contained in:
Eliseo Martínez 2014-11-04 15:41:48 +01:00
parent 336aab5eef
commit 22475b5ae8
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/nvim/regexp.c
View File

@ -1297,16 +1297,18 @@ static regprog_T *bt_regcomp(char_u *expr, int re_flags)
r->regstart = (*mb_ptr2char)(OPERAND(scan)); r->regstart = (*mb_ptr2char)(OPERAND(scan));
else else
r->regstart = *OPERAND(scan); r->regstart = *OPERAND(scan);
} else if ((OP(scan) == BOW } else if (OP(scan) == BOW
|| OP(scan) == EOW || OP(scan) == EOW
|| OP(scan) == NOTHING || OP(scan) == NOTHING
|| OP(scan) == MOPEN + 0 || OP(scan) == NOPEN || OP(scan) == MOPEN + 0 || OP(scan) == NOPEN
|| OP(scan) == MCLOSE + 0 || OP(scan) == NCLOSE) || OP(scan) == MCLOSE + 0 || OP(scan) == NCLOSE) {
&& OP(regnext(scan)) == EXACTLY) { char_u *regnext_scan = regnext(scan);
if (has_mbyte) if (OP(regnext_scan) == EXACTLY) {
r->regstart = (*mb_ptr2char)(OPERAND(regnext(scan))); if (has_mbyte)
else r->regstart = (*mb_ptr2char)(OPERAND(regnext_scan));
r->regstart = *OPERAND(regnext(scan)); else
r->regstart = *OPERAND(regnext_scan);
}
} }
/* /*