From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 14 Jan 2021 14:31:33 +0000 (+0100)
Subject: - rpz trigger, unlock and remove node when rpz is disabled with action override.
X-Git-Tag: release-1.14.0rc1~62^2~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c760a13a4a5d50af30e22f227087b23445f0541;p=thirdparty%2Funbound.git

- rpz trigger, unlock and remove node when rpz is disabled with action override.
---

diff --git a/services/rpz.c b/services/rpz.c
index b89583e8e..00f3b5a3d 100644
--- a/services/rpz.c
+++ b/services/rpz.c
@@ -1365,6 +1365,10 @@ rpz_resolve_client_action_and_zone(struct auth_zones* az, struct query_info* qin
 			stats->rpz_action[r->action_override]++;
 			lock_rw_unlock(&z->lock);
 			z = NULL;
+			if(node != NULL) {
+				lock_rw_unlock(&node->lock);
+				node = NULL;
+			}
 		}
 		if(z || node) {
 			break;