From: TCY16 <tom@nlnetlabs.nl>
Date: Wed, 21 Sep 2022 14:19:38 +0000 (+0200)
Subject: use correct edns_list attach function
X-Git-Tag: release-1.18.0rc1~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d731fa2e219095ffc0ac2da3733441dfd3427245;p=thirdparty%2Funbound.git

use correct edns_list attach function
---

diff --git a/daemon/worker.c b/daemon/worker.c
index 3f94b22d3..a13bb9530 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -486,16 +486,11 @@ answer_norec_from_cache(struct worker* worker, struct query_info* qinfo,
 					return 0;
 			/* Attached the cached EDE (RFC8914) */
 			if (worker->env.cfg->ede) {
-				size_t reason_bogus_str_len = 0;
 				char* reason_bogus_str = msg->rep->reason_bogus_str;
 
-				if (reason_bogus_str) {
-					reason_bogus_str_len = strlen(reason_bogus_str);
-				}
-
-				edns_opt_list_append(&edns->opt_list_out,
-					msg->rep->reason_bogus, reason_bogus_str_len,
-					reason_bogus_str, worker->scratchpad);
+				edns_opt_list_append_ede(&edns->opt_list_out,
+					worker->scratchpad, msg->rep->reason_bogus,
+					reason_bogus_str);
 			}
 			error_encode(repinfo->c->buffer, LDNS_RCODE_SERVFAIL, 
 				&msg->qinfo, id, flags, edns);
@@ -669,16 +664,11 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo,
 			goto bail_out;
 		/* Attached the cached EDE (RFC8914) */
 		if (worker->env.cfg->ede) {
-			size_t reason_bogus_str_len = 0;
 			char* reason_bogus_str = rep->reason_bogus_str;
 
-			if (reason_bogus_str) {
-				reason_bogus_str_len = strlen(reason_bogus_str);
-			}
-
-			edns_opt_list_append(&edns->opt_list_out,
-				rep->reason_bogus, reason_bogus_str_len,
-				reason_bogus_str, worker->scratchpad);
+			edns_opt_list_append_ede(&edns->opt_list_out,
+					worker->scratchpad, rep->reason_bogus,
+					reason_bogus_str);
 		}
 		error_encode(repinfo->c->buffer, LDNS_RCODE_SERVFAIL,
 			qinfo, id, flags, edns);