# HG changeset patch # User Bram Moolenaar # Date 1578834004 -3600 # Node ID 9f4648953f1ab203d9da6293b03fbb4e62436feb # Parent 8d183ace1c336faa49e65a930fd821c171490d4e patch 8.2.0112: illegal memory access when using 'cindent' Commit: https://github.com/vim/vim/commit/02ad46394e8f887b60fda994f8a5da2ac1937b23 Author: Bram Moolenaar Date: Sun Jan 12 13:48:18 2020 +0100 patch 8.2.0112: illegal memory access when using 'cindent' Problem: Illegal memory access when using 'cindent'. Solution: Check for NUL byte. (Dominique Pelle, closes https://github.com/vim/vim/issues/5470) diff --git a/src/cindent.c b/src/cindent.c --- a/src/cindent.c +++ b/src/cindent.c @@ -582,6 +582,8 @@ cin_iscase( for (s += 4; *s; ++s) { s = cin_skipcomment(s); + if (*s == NUL) + break; if (*s == ':') { if (s[1] == ':') // skip over "::" for C++ 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 @@ -5251,4 +5251,13 @@ func Test_cindent_56() enew! | close endfunc +" this was going beyond the end of the line. +func Test_cindent_case() + new + call setline(1, "case x: // x") + set cindent + norm! f:a: + 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 @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 112, +/**/ 111, /**/ 110,