From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 22 Mar 2021 08:42:04 +0000 (+0100)
Subject: - rpz-triggers, fix that after cname an nsdname or nsip trigger has cname
X-Git-Tag: release-1.14.0rc1~62^2~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e7ced72e5c68671c8586152ea518df61b7b2e05;p=thirdparty%2Funbound.git

- rpz-triggers, fix that after cname an nsdname or nsip trigger has cname
  rrsets prepended by the iterator.
---

diff --git a/iterator/iterator.c b/iterator/iterator.c
index f83170c16..0883b91b0 100644
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -2479,6 +2479,10 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
 			qstate->return_rcode = FLAGS_GET_RCODE(forged_response->rep->flags);
 			qstate->return_msg = forged_response;
 			next_state(iq, FINISHED_STATE);
+			if(!iter_prepend(iq, qstate->return_msg, qstate->region)) {
+				log_err("rpz, prepend rrsets: out of memory");
+				return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
+			}
 			return 0;
 		}
 	}
@@ -3039,7 +3043,7 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
 				qstate->return_msg = forged_response;
 				next_state(iq, FINISHED_STATE);
 				if(!iter_prepend(iq, qstate->return_msg, qstate->region)) {
-					log_err("rpz, prepend rrsets: out of memory");
+					log_err("rpz after cname, prepend rrsets: out of memory");
 					return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
 				}
 				qstate->return_msg->qinfo = qstate->qinfo;