From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 14 May 2021 15:27:15 +0000 (+0200)
Subject: - rpz-triggers, check for alloc failure and zone for add rpz soa.
X-Git-Tag: release-1.14.0rc1~62^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44f5d27683c4970ae66c7f10a7a2f991eba151f1;p=thirdparty%2Funbound.git

- rpz-triggers, check for alloc failure and zone for add rpz soa.
---

diff --git a/services/rpz.c b/services/rpz.c
index a389cf101..eb49f1cb3 100644
--- a/services/rpz.c
+++ b/services/rpz.c
@@ -1637,6 +1637,7 @@ rpz_add_soa(struct reply_info* rep, struct module_qstate* ms,
 	struct auth_rrset* soa = NULL;
 	struct ub_packed_rrset_key* rsoa = NULL;
 	struct ub_packed_rrset_key** prevrrsets;
+	if(!az) return 1;
 	soa = auth_zone_get_soa_rrset(az);
 	if(!soa) return 1;
 	if(!rep) return 0;
@@ -1645,6 +1646,8 @@ rpz_add_soa(struct reply_info* rep, struct module_qstate* ms,
 	prevrrsets = rep->rrsets;
 	rep->rrsets = regional_alloc_zero(ms->region,
 		sizeof(*rep->rrsets)*(rep->rrset_count+1));
+	if(!rep->rrsets)
+		return 0;
 	if(prevrrsets && rep->rrset_count > 0)
 		memcpy(rep->rrsets, prevrrsets, rep->rrset_count*sizeof(*rep->rrsets));
 	rep->rrset_count++;