From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 31 Jan 2020 06:49:14 +0000 (+0100)
Subject: - Fix fclose on error in TLS session ticket code.
X-Git-Tag: release-1.10.0rc1~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7495b25f9470dc5bfef9a8f7362b0794cb0a64ed;p=thirdparty%2Funbound.git

- Fix fclose on error in TLS session ticket code.
---

diff --git a/doc/Changelog b/doc/Changelog
index b15250545..5640c44f7 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+31 January 2020: Wouter
+	- Fix fclose on error in TLS session ticket code.
+
 30 January 2020: Ralph
 	- Fix memory leak in error condition remote.c
 	- Fix double free in error condition view.c
diff --git a/util/net_help.c b/util/net_help.c
index 8f83ec001..0869f91f9 100644
--- a/util/net_help.c
+++ b/util/net_help.c
@@ -1279,12 +1279,13 @@ int listen_sslctx_setup_ticket_keys(void* sslctx, struct config_strlist* tls_ses
 	for(p = tls_session_ticket_keys; p; p = p->next) {
 		size_t n;
 		unsigned char *data;
-		FILE *f = fopen(p->str, "r");
+		FILE *f;
 
 		data = (unsigned char *)malloc(80);
 		if(!data)
 			return 0;
 
+		f = fopen(p->str, "r");
 		if(!f) {
 			log_err("could not read tls-session-ticket-key %s: %s", p->str, strerror(errno));
 			free(data);