From: Ubuntu <rijswijk@fragtest.dnsjedi.org>
Date: Wed, 29 Jul 2020 15:26:42 +0000 (+0000)
Subject: Ensure packet_rrset_data is always initialised to zero upon allocation
X-Git-Tag: release-1.13.1rc1~7^2~1^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=506dad946b7388786f11435ebcbd667388d1da9f;p=thirdparty%2Funbound.git

Ensure packet_rrset_data is always initialised to zero upon allocation
---

diff --git a/dns64/dns64.c b/dns64/dns64.c
index 5c70119a5..39fd8778c 100644
--- a/dns64/dns64.c
+++ b/dns64/dns64.c
@@ -722,7 +722,7 @@ dns64_synth_aaaa_data(const struct ub_packed_rrset_key* fk,
 		*dd_out = NULL;
 		return; /* integer overflow protection in alloc */
 	}
-	if (!(dd = *dd_out = regional_alloc(region,
+	if (!(dd = *dd_out = regional_alloc_zero(region,
 		  sizeof(struct packed_rrset_data)
 		  + fd->count * (sizeof(size_t) + sizeof(time_t) +
 			     sizeof(uint8_t*) + 2 + 16)))) {
diff --git a/respip/respip.c b/respip/respip.c
index 6fa4f1885..dd0bed8be 100644
--- a/respip/respip.c
+++ b/respip/respip.c
@@ -523,7 +523,7 @@ copy_rrset(const struct ub_packed_rrset_key* key, struct regional* region)
 			return NULL; /* guard against integer overflow */
 		dsize += data->rr_len[i];
 	}
-	d = regional_alloc(region, dsize);
+	d = regional_alloc_zero(region, dsize);
 	if(!d)
 		return NULL;
 	*d = *data;
diff --git a/util/data/msgencode.c b/util/data/msgencode.c
index 5de9379a1..6798b1799 100644
--- a/util/data/msgencode.c
+++ b/util/data/msgencode.c
@@ -486,7 +486,7 @@ packed_rrset_encode(struct ub_packed_rrset_key* key, sldns_buffer* pkt,
 			if(data->rr_ttl[j] < adjust)
 				sldns_buffer_write_u32(pkt,
 					SERVE_EXPIRED?SERVE_EXPIRED_REPLY_TTL:0);
-			else 	sldns_buffer_write_u32(pkt, data->rr_ttl[j]-adjust);
+			else	sldns_buffer_write_u32(pkt, data->rr_ttl[j]-adjust);
 			if(c) {
 				if((r=compress_rdata(pkt, data->rr_data[j],
 					data->rr_len[j], region, tree, c))
@@ -523,7 +523,7 @@ packed_rrset_encode(struct ub_packed_rrset_key* key, sldns_buffer* pkt,
 			if(data->rr_ttl[i] < adjust)
 				sldns_buffer_write_u32(pkt,
 					SERVE_EXPIRED?SERVE_EXPIRED_REPLY_TTL:0);
-			else 	sldns_buffer_write_u32(pkt, data->rr_ttl[i]-adjust);
+			else	sldns_buffer_write_u32(pkt, data->rr_ttl[i]-adjust);
 			/* rrsig rdata cannot be compressed, perform 100+ byte
 			 * memcopy. */
 			sldns_buffer_write(pkt, data->rr_data[i],
diff --git a/util/data/msgreply.c b/util/data/msgreply.c
index 5a6c1f853..6fce9a732 100644
--- a/util/data/msgreply.c
+++ b/util/data/msgreply.c
@@ -323,8 +323,8 @@ parse_create_rrset(sldns_buffer* pkt, struct rrset_parse* pset,
 		(sizeof(size_t)+sizeof(uint8_t*)+sizeof(time_t)) + 
 		pset->size;
 	if(region)
-		*data = regional_alloc(region, s);
-	else	*data = malloc(s);
+		*data = regional_alloc_zero(region, s);
+	else	*data = calloc(1, s);
 	if(!*data)
 		return 0;
 	/* copy & decompress */