From 2aa5f696b91a51f29873e340de4bdc182e1e8dd4 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 24 Jan 2017 15:46:48 +0100 Subject: 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. --- src/fileio.c | 3 ++- src/testdir/test_fileformat.vim | 2 +- src/version.c | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/fileio.c b/src/fileio.c index 39e356f88..9380953d2 100644 --- 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 index de505d3bd..8dc25f62b 100644 --- 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 index 7087f6424..84dde7353 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 227, /**/ 226, /**/ -- cgit v1.2.1