diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-12-21 18:24:00 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-12-21 18:24:00 +0100 |
| commit | a3d10a508c404a32485adc86284725e0bdc5b602 (patch) | |
| tree | 0b12449a963214d2826c741968e16aba20a565ec | |
| parent | 6f17a3f0237302b82cc31fb889d9094b51856948 (diff) | |
| download | vim-git-a3d10a508c404a32485adc86284725e0bdc5b602.tar.gz | |
patch 8.2.2181: valgrind warnings for using uninitialized valuev8.2.2181
Problem: Valgrind warnings for using uninitialized value.
Solution: Do not use "start" or "end" unless there is a match.
| -rw-r--r-- | src/regexp_bt.c | 27 | ||||
| -rw-r--r-- | src/regexp_nfa.c | 27 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 32 insertions, 24 deletions
diff --git a/src/regexp_bt.c b/src/regexp_bt.c index 476f34ef4..2960bad94 100644 --- a/src/regexp_bt.c +++ b/src/regexp_bt.c @@ -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; diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index 6182f58cd..ad47142d6 100644 --- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -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; diff --git a/src/version.c b/src/version.c index 07edd0c9e..04951e46d 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2181, +/**/ 2180, /**/ 2179, |