From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 23 Oct 2020 09:47:00 +0000 (+0200)
Subject: zonemd, unbound-control auth_zone_reload errors when ZONEMD fails.
X-Git-Tag: release-1.13.2rc1~269^2~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89087ae294d2094e7cded00fc7cfebb2a95d7f40;p=thirdparty%2Funbound.git

zonemd, unbound-control auth_zone_reload errors when ZONEMD fails.
---

diff --git a/daemon/remote.c b/daemon/remote.c
index 8a6ede426..7c99e4f29 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -2566,14 +2566,17 @@ do_auth_zone_reload(RES* ssl, struct worker* worker, char* arg)
 	auth_zone_verify_zonemd(z, &worker->env, &worker->env.mesh->mods,
 		&reason, 0, 0);
 	if(reason && z->zone_expired) {
+		lock_rw_unlock(&z->lock);
 		(void)ssl_printf(ssl, "error zonemd for %s failed: %s\n",
 			arg, reason);
+		free(reason);
+		return;
 	} else if(reason && strcmp(reason, "ZONEMD verification successful")
 		==0) {
 		(void)ssl_printf(ssl, "%s: %s\n", arg, reason);
 	}
-	free(reason);
 	lock_rw_unlock(&z->lock);
+	free(reason);
 	send_ok(ssl);
 }