- Fix for EDNS EDE size calculation.

NLnetLabs · Aug 1, 2023 · 990b12b · 990b12b
1 parent 11f12bc
commit 990b12b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/doc/Changelog b/doc/Changelog
@@ -4,6 +4,9 @@
 	- For #911: Try to trim EXTRA-TEXT (and LDNS_EDE_OTHER options
 	  altogether) before giving up on attaching EDE options.
 
+1 August 2023: Wouter
+	- Fix for EDNS EDE size calculation.
+
 31 July 2023: George
 	- Merge #790 from Tom Carpay: Add support for EDE caching in cachedb
 	  and subnetcache.

diff --git a/util/data/msgencode.c b/util/data/msgencode.c
@@ -833,22 +833,24 @@ calc_ede_option_size(struct edns_data* edns, uint16_t* txt_size)
 	if(!edns || !edns->edns_present)
 		return 0;
 	for(opt = edns->opt_list_inplace_cb_out; opt; opt = opt->next) {
-		if(opt->opt_code == LDNS_EDNS_EDE)
+		if(opt->opt_code == LDNS_EDNS_EDE) {
 			rdatalen += 4 + opt->opt_len;
 			if(opt->opt_len > 2)
 				*txt_size += opt->opt_len - 2;
 			if(opt->opt_len >= 2 && sldns_read_uint16(
 				opt->opt_data) == LDNS_EDE_OTHER)
 				*txt_size += 4 + 2;
+		}
 	}
 	for(opt = edns->opt_list_out; opt; opt = opt->next) {
-		if(opt->opt_code == LDNS_EDNS_EDE)
+		if(opt->opt_code == LDNS_EDNS_EDE) {
 			rdatalen += 4 + opt->opt_len;
 			if(opt->opt_len > 2)
 				*txt_size += opt->opt_len - 2;
 			if(opt->opt_len >= 2 && sldns_read_uint16(
 				opt->opt_data) == LDNS_EDE_OTHER)
 				*txt_size += 4 + 2;
+		}
 	}
 	return rdatalen;
 }