# HG changeset patch # User Christian Brabandt # Date 1485270005 -3600 # Node ID d6857a8dc07ed8c50de53c531ee4b054acf5803a # Parent 641d87b64bab8cfdb8bc76100e8d6bacdc553cc6 patch 8.0.0227: crash with ff=dos when first line in file has no CR commit https://github.com/vim/vim/commit/2aa5f696b91a51f29873e340de4bdc182e1e8dd4 Author: Bram Moolenaar Date: Tue Jan 24 15:46:48 2017 +0100 patch 8.0.0227: crash with ff=dos when first line in file has no CR Problem: Crash when 'fileformat' is forced to "dos" and the first line in the file is empty and does not have a CR character. Solution: Don't check for CR before the start of the buffer. diff --git a/src/fileio.c b/src/fileio.c --- a/src/fileio.c +++ b/src/fileio.c @@ -2251,8 +2251,9 @@ rewind_retry: len = (colnr_T)(ptr - line_start + 1); if (fileformat == EOL_DOS) { - if (ptr[-1] == CAR) /* remove CR */ + if (ptr > line_start && ptr[-1] == CAR) { + /* remove CR before NL */ ptr[-1] = NUL; --len; } diff --git a/src/testdir/test_fileformat.vim b/src/testdir/test_fileformat.vim --- a/src/testdir/test_fileformat.vim +++ b/src/testdir/test_fileformat.vim @@ -17,7 +17,7 @@ func Test_fileformat_after_bw() endfunc func Test_fileformat_autocommand() - let filecnt = ["\", "foobar\", "eins\", "\", "zwei\", "drei", "vier", "fünf", ""] + let filecnt = ["", "foobar\", "eins\", "\", "zwei\", "drei", "vier", "fünf", ""] let ffs = &ffs call writefile(filecnt, 'Xfile', 'b') au BufReadPre Xfile set ffs=dos ff=dos diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 227, +/**/ 226, /**/ 225,