Mercurial > vim
comparison src/fileio.c @ 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 | 6a252c6afd5b |
| children | 5780bd3a5a7e |
comparison
equal
deleted
inserted
replaced
| 10673:641d87b64bab | 10674:d6857a8dc07e |
|---|---|
| 2249 { | 2249 { |
| 2250 *ptr = NUL; /* end of line */ | 2250 *ptr = NUL; /* end of line */ |
| 2251 len = (colnr_T)(ptr - line_start + 1); | 2251 len = (colnr_T)(ptr - line_start + 1); |
| 2252 if (fileformat == EOL_DOS) | 2252 if (fileformat == EOL_DOS) |
| 2253 { | 2253 { |
| 2254 if (ptr[-1] == CAR) /* remove CR */ | 2254 if (ptr > line_start && ptr[-1] == CAR) |
| 2255 { | 2255 { |
| 2256 /* remove CR before NL */ | |
| 2256 ptr[-1] = NUL; | 2257 ptr[-1] = NUL; |
| 2257 --len; | 2258 --len; |
| 2258 } | 2259 } |
| 2259 /* | 2260 /* |
| 2260 * Reading in Dos format, but no CR-LF found! | 2261 * Reading in Dos format, but no CR-LF found! |