mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-05 01:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-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.
a3d10a508c
This commit is contained in:
Jan Edmund Lazo
2020-12-21 21:30:01 -05:00
parent 1eab3584ba
commit 07425d45e6
2 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/nvim/regexp.c
View File

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

26
src/nvim/regexp_nfa.c
View File

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