Concatenate segments of a TXT record.

* lib/dns.c (txt_lookup): Concatenate multiple ans->rrs.manyistr.

1 files changed, 16 insertions, 2 deletions

diff --git a/lib/dns.c b/lib/dns.c
index ac6c4d8c..3119aece 100644
--- a/lib/dns.c
+++ b/lib/dns.c
@@ -549,8 +549,22 @@ txt_lookup(const char *name, struct dns_reply *reply)
 	if (status == dns_success) {
 		int i;
 		dns_reply_init(reply, dns_reply_str, ans->nrrs);
-		for (i = 0; i < ans->nrrs; i++)
-			reply->data.str[i] = mu_strdup(ans->rrs.manyistr[i]->str);
+		for (i = 0; i < ans->nrrs; i++) {
+			size_t l = 0;
+			int j;
+			for (j = 0; ans->rrs.manyistr[i][j].i > 0; j++)
+				l += ans->rrs.manyistr[i][j].i;
+			reply->data.str[i] = mu_alloc(l + 1);
+			reply->data.str[i][0] = 0;
+			l = 0;
+			for (j = 0; ans->rrs.manyistr[i][j].i > 0; j++) {
+				memcpy(reply->data.str[i] + l,
+				       ans->rrs.manyistr[i][j].str,
+				       ans->rrs.manyistr[i][j].i);
+				l += ans->rrs.manyistr[i][j].i;
+			}
+			reply->data.str[i][l] = 0;
+		}
 	}
 	free(ans);
 	return status;