From: Dominique Pelle <dominique.pelle@gmail.com>
Date: Mon, 21 Jun 2021 18:15:37 +0000 (+0200)
Subject: patch 8.2.3030: Coverity reports a memory leak
X-Git-Tag: v8.2.3030
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb54bc65625abad9a0af501acac5c70fba17e2cc;p=vim

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 #8418)
---

diff --git a/src/crypt.c b/src/crypt.c
index 35d4e14dc..f844e4209 100644
--- 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;
diff --git a/src/errors.h b/src/errors.h
index cb93efd90..9663ecdd6 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -442,7 +442,7 @@ EXTERN char e_libsodium_decryption_failed_header_incomplete[]
 	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!"));
diff --git a/src/version.c b/src/version.c
index 096235fc9..0c3c887d1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3030,
 /**/
     3029,
 /**/