Mercurial > vim
changeset 24986:fa31a0ea09e1 v8.2.3030
patch 8.2.3030: Coverity reports a memory leak
Commit: https://github.com/vim/vim/commit/cb54bc65625abad9a0af501acac5c70fba17e2cc
Author: Dominique Pelle <dominique.pelle@gmail.com>
Date: Mon Jun 21 20:15:37 2021 +0200
patch 8.2.3030: Coverity reports a memory leak
Problem: Coverity reports a memory leak.
Solution: Fix the leak and a few typos. (Dominique Pell?, closes https://github.com/vim/vim/issues/8418)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 21 Jun 2021 20:30:04 +0200 |
| parents | a6816d5be1ac |
| children | 5a15a7f25ff2 |
| files | src/crypt.c src/errors.h src/version.c |
| diffstat | 3 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/crypt.c +++ b/src/crypt.c @@ -819,19 +819,19 @@ crypt_sodium_decode( if (sod_st->count && len <= crypto_secretstream_xchacha20poly1305_ABYTES) { emsg(e_libsodium_cannot_decrypt_buffer); - return; + goto fail; } if (crypto_secretstream_xchacha20poly1305_pull(&sod_st->state, buf_out, &buf_len, &tag, from, len, NULL, 0) != 0) { - emsg(e_libsodium_decription_failed); + emsg(e_libsodium_decryption_failed); goto fail; } sod_st->count++; if (tag == crypto_secretstream_xchacha20poly1305_TAG_FINAL && !last) { - emsg(e_libsodium_decyption_failed_premature); + emsg(e_libsodium_decryption_failed_premature); goto fail; } if (p1 == p2) @@ -931,12 +931,12 @@ crypt_sodium_buffer_decode( if (crypto_secretstream_xchacha20poly1305_pull(&sod_st->state, *buf_out, &out_len, &tag, from, len, NULL, 0) != 0) { - emsg(e_libsodium_decription_failed); + emsg(e_libsodium_decryption_failed); return -1; } if (tag == crypto_secretstream_xchacha20poly1305_TAG_FINAL && !last) - emsg(e_libsodium_decyption_failed_premature); + emsg(e_libsodium_decryption_failed_premature); return (long) out_len; # else return -1;
--- a/src/errors.h +++ b/src/errors.h @@ -442,7 +442,7 @@ EXTERN char e_libsodium_decryption_faile INIT(= N_("E1198: Decryption failed: Header incomplete!")); EXTERN char e_libsodium_cannot_decrypt_buffer[] INIT(= N_("E1199: Cannot decrypt buffer, not enough space")); -EXTERN char e_libsodium_decription_failed[] +EXTERN char e_libsodium_decryption_failed[] INIT(= N_("E1200: Decryption failed: corrupted chunk!")); -EXTERN char e_libsodium_decyption_failed_premature[] +EXTERN char e_libsodium_decryption_failed_premature[] INIT(= N_("E1201: Decryption failed: pre-mature end of file!"));