thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2181: valgrind warnings for using uninitialized value

Browse Source 
Problem:    Valgrind warnings for using uninitialized value.
Solution:   Do not use "start" or "end" unless there is a match.
This commit is contained in:
Bram Moolenaar
2020-12-21 18:24:00 +01:00
parent 6f17a3f023
commit a3d10a508c
3 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/regexp_bt.c
View File

@@ -4805,21 +4805,24 @@ theend:
if (backpos.ga_maxlen > BACKPOS_INITIAL)
ga_clear(&backpos);
// Make sure the end is never before the start. Can happen when \zs and
// \ze are used.
if (REG_MULTI)
if (retval > 0)
{
lpos_T *start = &rex.reg_mmatch->startpos[0];
lpos_T *end = &rex.reg_mmatch->endpos[0];
// Make sure the end is never before the start. Can happen when \zs
// and \ze are used.
if (REG_MULTI)
{
lpos_T *start = &rex.reg_mmatch->startpos[0];
lpos_T *end = &rex.reg_mmatch->endpos[0];
if (end->lnum < start->lnum
if (end->lnum < start->lnum
|| (end->lnum == start->lnum && end->col < start->col))
rex.reg_mmatch->endpos[0] = rex.reg_mmatch->startpos[0];
}
else
{
if (rex.reg_match->endp[0] < rex.reg_match->startp[0])
rex.reg_match->endp[0] = rex.reg_match->startp[0];
rex.reg_mmatch->endpos[0] = rex.reg_mmatch->startpos[0];
}
else
{
if (rex.reg_match->endp[0] < rex.reg_match->startp[0])
rex.reg_match->endp[0] = rex.reg_match->startp[0];
}
}
return retval;

27
src/regexp_nfa.c
View File

@@ -7227,21 +7227,24 @@ nfa_regexec_both(
#endif
theend:
// Make sure the end is never before the start. Can happen when \zs and
// \ze are used.
if (REG_MULTI)
if (retval > 0)
{
lpos_T *start = &rex.reg_mmatch->startpos[0];
lpos_T *end = &rex.reg_mmatch->endpos[0];
// Make sure the end is never before the start. Can happen when \zs and
// \ze are used.
if (REG_MULTI)
{
lpos_T *start = &rex.reg_mmatch->startpos[0];
lpos_T *end = &rex.reg_mmatch->endpos[0];
if (end->lnum < start->lnum
if (end->lnum < start->lnum
|| (end->lnum == start->lnum && end->col < start->col))
rex.reg_mmatch->endpos[0] = rex.reg_mmatch->startpos[0];
}
else if (retval > 0)
{
if (rex.reg_match->endp[0] < rex.reg_match->startp[0])
rex.reg_match->endp[0] = rex.reg_match->startp[0];
rex.reg_mmatch->endpos[0] = rex.reg_mmatch->startpos[0];
}
else
{
if (rex.reg_match->endp[0] < rex.reg_match->startp[0])
rex.reg_match->endp[0] = rex.reg_match->startp[0];
}
}
return retval;

2
src/version.c
View File

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