From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Thu, 16 Nov 2017 11:27:23 +0000 (+0200)
Subject: mail-crypt: Do not free global keys if no error has occured
X-Git-Tag: 2.3.0.rc1~442
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=abd2ac9eb17f620557716af62434c4c751d7c819;p=thirdparty%2Fdovecot%2Fcore.git

mail-crypt: Do not free global keys if no error has occured
---

diff --git a/src/plugins/mail-crypt/mail-crypt-pluginenv.c b/src/plugins/mail-crypt/mail-crypt-pluginenv.c
index c152664be7..3c634752c5 100644
--- a/src/plugins/mail-crypt/mail-crypt-pluginenv.c
+++ b/src/plugins/mail-crypt/mail-crypt-pluginenv.c
@@ -100,6 +100,7 @@ int mail_crypt_global_keys_load_pluginenv(const char *set_prefix,
 						error_r) < 0)
 		ret = -1;
 
-	mail_crypt_global_keys_free(global_keys_r);
+	if (ret != 0)
+		mail_crypt_global_keys_free(global_keys_r);
 	return ret;
 }