From e031fe90cf2e375ce861ff5e5e281e4ad229ebb9 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 5 Dec 2021 12:06:24 +0000 Subject: [PATCH] patch 8.2.3741: using freed memory in open command Problem: Using freed memory in open command. Solution: Make a copy of the current line. Reference:https://github.com/vim/vim/commit/e031fe90cf2e375ce861ff5e5e281e4ad229ebb9 Conflict:src/testdir/test_ex_mode.vim, The current version does not exist and therefore does not fit into this test case --- src/ex_docmd.c | 10 +++++++--- src/version.c | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 203174a..cb6b64a 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -6030,13 +6030,17 @@ ex_open(exarg_T *eap) regmatch.regprog = vim_regcomp(eap->arg, p_magic ? RE_MAGIC : 0); if (regmatch.regprog != NULL) { + // make a copy of the line, when searching for a mark it might be + // flushed + char_u *line = vim_strsave(ml_get_curline()); + regmatch.rm_ic = p_ic; - p = ml_get_curline(); - if (vim_regexec(®match, p, (colnr_T)0)) - curwin->w_cursor.col = (colnr_T)(regmatch.startp[0] - p); + if (vim_regexec(®match, line, (colnr_T)0)) + curwin->w_cursor.col = (colnr_T)(regmatch.startp[0] - line); else emsg(_(e_nomatch)); vim_regfree(regmatch.regprog); + vim_free(line); } // Move to the NUL, ignore any other arguments. eap->arg += STRLEN(eap->arg); diff --git a/src/version.c b/src/version.c index 035c46f..bd45631 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 3741, /**/ 3403, /**/ -- 2.27.0