Mercurial > vim
changeset 10674:d6857a8dc07e v8.0.0227
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 <Bram@vim.org>
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.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 24 Jan 2017 16:00:05 +0100 |
| parents | 641d87b64bab |
| children | 4fc5b92e6ae4 |
| files | src/fileio.c src/testdir/test_fileformat.vim src/version.c |
| diffstat | 3 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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; }
--- 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 = ["\<CR>", "foobar\<CR>", "eins\<CR>", "\<CR>", "zwei\<CR>", "drei", "vier", "fünf", ""] + let filecnt = ["", "foobar\<CR>", "eins\<CR>", "\<CR>", "zwei\<CR>", "drei", "vier", "fünf", ""] let ffs = &ffs call writefile(filecnt, 'Xfile', 'b') au BufReadPre Xfile set ffs=dos ff=dos