Skip to content

Commit

Permalink
patch 8.2.3625: illegal memory access when C-indenting
Browse files Browse the repository at this point in the history
Problem:    Illegal memory access when C-indenting.
Solution:   Also set the cursor column.
  • Loading branch information
brammool committed Nov 19, 2021
1 parent 3ad6953 commit 2de9b7c
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/cindent.c
Expand Up @@ -1637,10 +1637,10 @@ get_baseclass_amount(int col)
static pos_T *
find_start_brace(void) // XXX
{
pos_T cursor_save;
pos_T *trypos;
pos_T *pos;
static pos_T pos_copy;
pos_T cursor_save;
pos_T *trypos;
pos_T *pos;
static pos_T pos_copy;

cursor_save = curwin->w_cursor;
while ((trypos = findmatchlimit(NULL, '{', FM_BLOCKSTOP, 0)) != NULL)
Expand All @@ -1654,7 +1654,7 @@ find_start_brace(void) // XXX
&& (pos = ind_find_start_CORS(NULL)) == NULL) // XXX
break;
if (pos != NULL)
curwin->w_cursor.lnum = pos->lnum;
curwin->w_cursor = *pos;
}
curwin->w_cursor = cursor_save;
return trypos;
Expand Down
12 changes: 12 additions & 0 deletions src/testdir/test_cindent.vim
Expand Up @@ -5314,4 +5314,16 @@ func Test_backslash_at_end_of_line()
bwipe!
endfunc

func Test_find_brace_backwards()
" this was looking beyond the end of the line
new
norm R/*
norm o0{
norm o//
norm V{=
call assert_equal(['/*', ' 0{', '//'], getline(1, 3))
bwipe!
endfunc


" vim: shiftwidth=2 sts=2 expandtab
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -757,6 +757,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
3625,
/**/
3624,
/**/
Expand Down

0 comments on commit 2de9b7c

Please sign in to comment.