Mercurial > vim
changeset 31227:1a9e44a45614 v9.0.0947
patch 9.0.0947: invalid memory access in substitute with function
Commit: https://github.com/vim/vim/commit/cc762a48d42b579fb7bdec2c614636b830342dd5
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Nov 25 13:03:31 2022 +0000
patch 9.0.0947: invalid memory access in substitute with function
Problem: Invalid memory access in substitute with function that goes to
another file.
Solution: Check for text locked in CTRL-W gf.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 25 Nov 2022 14:15:05 +0100 |
| parents | 8338f377b098 |
| children | e02f5b4a17ee |
| files | src/normal.c src/proto/normal.pro src/testdir/test_substitute.vim src/version.c src/window.c |
| diffstat | 5 files changed, 49 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/normal.c +++ b/src/normal.c @@ -188,7 +188,8 @@ check_text_locked(oparg_T *oap) { if (text_locked()) { - clearopbeep(oap); + if (oap != NULL) + clearopbeep(oap); text_locked_msg(); return TRUE; } @@ -196,6 +197,25 @@ check_text_locked(oparg_T *oap) } /* + * If text is locked, "curbuf_lock" or "allbuf_lock" is set: + * Give an error message, possibly beep and return TRUE. + * "oap" may be NULL. + */ + int +check_text_or_curbuf_locked(oparg_T *oap) +{ + if (check_text_locked(oap)) + return TRUE; + if (curbuf_locked()) + { + if (oap != NULL) + clearop(oap); + return TRUE; + } + return FALSE; +} + +/* * Handle the count before a normal command and set cap->count0. */ static int @@ -798,8 +818,7 @@ normal_cmd( goto normal_end; } - if ((nv_cmds[idx].cmd_flags & NV_NCW) - && (check_text_locked(oap) || curbuf_locked())) + if ((nv_cmds[idx].cmd_flags & NV_NCW) && check_text_or_curbuf_locked(oap)) // this command is not allowed now goto normal_end; @@ -4026,13 +4045,9 @@ nv_gotofile(cmdarg_T *cap) char_u *ptr; linenr_T lnum = -1; - if (check_text_locked(cap->oap)) + if (check_text_or_curbuf_locked(cap->oap)) return; - if (curbuf_locked()) - { - clearop(cap->oap); - return; - } + #ifdef FEAT_PROP_POPUP if (ERROR_IF_TERM_POPUP_WINDOW) return;
--- a/src/proto/normal.pro +++ b/src/proto/normal.pro @@ -1,4 +1,5 @@ /* normal.c */ +int check_text_or_curbuf_locked(oparg_T *oap); void normal_cmd(oparg_T *oap, int toplevel); void check_visual_highlight(void); void end_visual_mode(void);
--- a/src/testdir/test_substitute.vim +++ b/src/testdir/test_substitute.vim @@ -1096,6 +1096,25 @@ func Test_sub_edit_scriptfile() bwipe! endfunc +" This was editing another file from the expression. +func Test_sub_expr_goto_other_file() + call writefile([''], 'Xfileone', 'D') + enew! + call setline(1, ['a', 'b', 'c', 'd', + \ 'Xfileone zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz']) + + func g:SplitGotoFile() + exe "sil! norm 0\<C-W>gf" + return '' + endfunc + + $ + s/\%')/\=g:SplitGotoFile() + + delfunc g:SplitGotoFile + bwipe! +endfunc + " Test for the 2-letter and 3-letter :substitute commands func Test_substitute_short_cmd() new
--- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 947, +/**/ 946, /**/ 945,
--- a/src/window.c +++ b/src/window.c @@ -567,6 +567,8 @@ newwindow: case Ctrl_F: wingotofile: CHECK_CMDWIN; + if (check_text_or_curbuf_locked(NULL)) + break; ptr = grab_file_name(Prenum1, &lnum); if (ptr != NULL) @@ -885,7 +887,7 @@ win_split(int size, int flags) * When "new_wp" is NULL: split the current window in two. * When "new_wp" is not NULL: insert this window at the far * top/left/right/bottom. - * return FAIL for failure, OK otherwise + * Return FAIL for failure, OK otherwise. */ int win_split_ins(