Mercurial > vim
changeset 23270:22d0c25869d8 v8.2.2181
patch 8.2.2181: valgrind warnings for using uninitialized value
Commit: https://github.com/vim/vim/commit/a3d10a508c404a32485adc86284725e0bdc5b602
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Dec 21 18:24:00 2020 +0100
patch 8.2.2181: valgrind warnings for using uninitialized value
Problem: Valgrind warnings for using uninitialized value.
Solution: Do not use "start" or "end" unless there is a match.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 21 Dec 2020 18:30:04 +0100 |
| parents | 50c3cbc5b9b2 |
| children | 50ebb4982f37 |
| files | src/regexp_bt.c src/regexp_nfa.c src/version.c |
| diffstat | 3 files changed, 34 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- 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]; - - if (end->lnum < start->lnum + // 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 || (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;
--- 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]; - - if (end->lnum < start->lnum + // 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 || (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;