mirror of
https://github.com/neovim/neovim.git
synced 2025-10-06 18:06:30 +00:00
vim-patch:8.2.3612: using freed memory with regexp using a mark (#16973)
Problem: Using freed memory with regexp using a mark.
Solution: Get the line again after getting the mark position.
64066b9acd
This commit is contained in:
@@ -3232,7 +3232,7 @@ typedef struct {
|
|||||||
// The current match-position is remembered with these variables:
|
// The current match-position is remembered with these variables:
|
||||||
linenr_T lnum; ///< line number, relative to first line
|
linenr_T lnum; ///< line number, relative to first line
|
||||||
char_u *line; ///< start of current line
|
char_u *line; ///< start of current line
|
||||||
char_u *input; ///< current input, points into "regline"
|
char_u *input; ///< current input, points into "line"
|
||||||
|
|
||||||
int need_clear_subexpr; ///< subexpressions still need to be cleared
|
int need_clear_subexpr; ///< subexpressions still need to be cleared
|
||||||
int need_clear_zsubexpr; ///< extmatch subexpressions still need to be
|
int need_clear_zsubexpr; ///< extmatch subexpressions still need to be
|
||||||
|
@@ -6071,8 +6071,15 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start,
|
|||||||
case NFA_MARK_GT:
|
case NFA_MARK_GT:
|
||||||
case NFA_MARK_LT:
|
case NFA_MARK_LT:
|
||||||
{
|
{
|
||||||
|
size_t col = rex.input - rex.line;
|
||||||
pos_T *pos = getmark_buf(rex.reg_buf, t->state->val, false);
|
pos_T *pos = getmark_buf(rex.reg_buf, t->state->val, false);
|
||||||
|
|
||||||
|
// Line may have been freed, get it again.
|
||||||
|
if (REG_MULTI) {
|
||||||
|
rex.line = reg_getline(rex.lnum);
|
||||||
|
rex.input = rex.line + col;
|
||||||
|
}
|
||||||
|
|
||||||
// Compare the mark position to the match position, if the mark
|
// Compare the mark position to the match position, if the mark
|
||||||
// exists and mark is set in reg_buf.
|
// exists and mark is set in reg_buf.
|
||||||
if (pos != NULL && pos->lnum > 0) {
|
if (pos != NULL && pos->lnum > 0) {
|
||||||
|
@@ -787,4 +787,12 @@ func Test_regexp_error()
|
|||||||
set re&
|
set re&
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_using_mark_position()
|
||||||
|
" this was using freed memory
|
||||||
|
new
|
||||||
|
norm O0
|
||||||
|
call assert_fails("s/\\%')", 'E486:')
|
||||||
|
bwipe!
|
||||||
|
endfunc
|
||||||
|
|
||||||
" vim: shiftwidth=2 sts=2 expandtab
|
" vim: shiftwidth=2 sts=2 expandtab
|
||||||
|
Reference in New Issue
Block a user