From: Tom Carpay <tom@nlnetlabs.nl>
Date: Tue, 25 May 2021 09:43:50 +0000 (+0200)
Subject: Merge branch 'svcb' of github.com:NLnetLabs/unbound into svcb
X-Git-Tag: release-1.13.2rc1~42^2~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e21e7e7f60ad7bdb5397ab3dec24c656040d80aa;p=thirdparty%2Funbound.git

Merge branch 'svcb' of github.com:NLnetLabs/unbound into svcb
---

e21e7e7f60ad7bdb5397ab3dec24c656040d80aa
diff --cc sldns/str2wire.c
index dba21a093,1ed41764d..1b09766bc
--- a/sldns/str2wire.c
+++ b/sldns/str2wire.c
@@@ -1115,8 -1115,9 +1115,10 @@@ sldns_str2wire_svcbparam_ipv6hint(cons
  		if (!(next_ip_str = strchr(val, ','))) {
  			if (inet_pton(AF_INET6, val, rd + *rd_len) != 1)
  				break;
 +			*rd_len += LDNS_IP6ADDRLEN;
  
+ 			*rd_len += LDNS_IP6ADDRLEN;
+ 
  			assert(count == 1);
  
  		} else if (next_ip_str - val >= (int)sizeof(ip_str))