Mercurial > vim
diff src/fileio.c @ 24990:85d1e82ed134 v8.2.3032
patch 8.2.3032: build problems with MSVC, other crypt issues with libsodium
Commit: https://github.com/vim/vim/commit/226b28b96150e59375d2bff44e0aadd382b0c3f1
Author: Christian Brabandt <cb@256bit.org>
Date: Mon Jun 21 21:08:08 2021 +0200
patch 8.2.3032: build problems with MSVC, other crypt issues with libsodium
Problem: Build problems with MSVC, other crypt issues with libsodium.
Solution: Adjust MSVC makefile. Disable swap file only when 'key' is set.
Adjust error message used when key is wrong. Fix Coverity issues.
(Christian Brabandt, closes #8420, closes #8411)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 21 Jun 2021 21:15:04 +0200 |
parents | 7e9e53a0368f |
children | 965d97f8208b |
line wrap: on
line diff
--- a/src/fileio.c +++ b/src/fileio.c @@ -1213,6 +1213,7 @@ retry: * Read bytes from curbuf. Used for converting text read * from stdin. */ + eof = FALSE; if (read_buf_lnum > from) size = 0; else @@ -1261,6 +1262,7 @@ retry: if (!curbuf->b_p_eol) --tlen; size = tlen; + eof = TRUE; break; } } @@ -1276,7 +1278,7 @@ retry: // Let the crypt layer work with a buffer size of 8192 if (filesize == 0) // set size to 8K + Sodium Crypt Metadata - size = WRITEBUFSIZE + 36 + size = WRITEBUFSIZE + crypt_get_max_header_len() + crypto_secretstream_xchacha20poly1305_HEADERBYTES + crypto_secretstream_xchacha20poly1305_ABYTES;