# HG changeset patch # User Bram Moolenaar # Date 1637351104 -3600 # Node ID 8e92f01f7226eabfcd9100aa09b38618b221b334 # Parent f80b615131df52cbc98421810fb0422b78bea73c patch 8.2.3625: illegal memory access when C-indenting Commit: https://github.com/vim/vim/commit/2de9b7c7c8791da8853a9a7ca9c467867465b655 Author: Bram Moolenaar Date: Fri Nov 19 19:41:13 2021 +0000 patch 8.2.3625: illegal memory access when C-indenting Problem: Illegal memory access when C-indenting. Solution: Also set the cursor column. diff --git a/src/cindent.c b/src/cindent.c --- a/src/cindent.c +++ b/src/cindent.c @@ -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) @@ -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; diff --git a/src/testdir/test_cindent.vim b/src/testdir/test_cindent.vim --- a/src/testdir/test_cindent.vim +++ b/src/testdir/test_cindent.vim @@ -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 diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3625, +/**/ 3624, /**/ 3623,