Skip to content

Commit

Permalink
patch 9.0.0947: invalid memory access in substitute with function
Browse files Browse the repository at this point in the history
Problem:    Invalid memory access in substitute with function that goes to
            another file.
Solution:   Check for text locked in CTRL-W gf.
  • Loading branch information
brammool committed Nov 25, 2022
1 parent ad85af5 commit cc762a4
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 10 deletions.
33 changes: 24 additions & 9 deletions src/normal.c
Expand Up @@ -188,13 +188,33 @@ check_text_locked(oparg_T *oap)
{
if (text_locked())
{
clearopbeep(oap);
if (oap != NULL)
clearopbeep(oap);
text_locked_msg();
return TRUE;
}
return FALSE;
}

/*
* 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.
*/
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -4026,13 +4045,9 @@ nv_gotofile(cmdarg_T *cap)
char_u *ptr;
linenr_T lnum = -1;

if (check_text_locked(cap->oap))
return;
if (curbuf_locked())
{
clearop(cap->oap);
if (check_text_or_curbuf_locked(cap->oap))
return;
}

#ifdef FEAT_PROP_POPUP
if (ERROR_IF_TERM_POPUP_WINDOW)
return;
Expand Down
1 change: 1 addition & 0 deletions 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);
Expand Down
19 changes: 19 additions & 0 deletions src/testdir/test_substitute.vim
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -695,6 +695,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
947,
/**/
946,
/**/
Expand Down
4 changes: 3 additions & 1 deletion src/window.c
Expand Up @@ -567,6 +567,8 @@ do_window(
case Ctrl_F:
wingotofile:
CHECK_CMDWIN;
if (check_text_or_curbuf_locked(NULL))
break;

ptr = grab_file_name(Prenum1, &lnum);
if (ptr != NULL)
Expand Down Expand Up @@ -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(
Expand Down

0 comments on commit cc762a4

Please sign in to comment.