X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=service.c;h=763c89979d1463d0cf2979b3750db9e7a359bc98;hp=354099bd5dfe6fc04da21719712c6bd376bb1621;hb=a0f1b43caf06e13067ccadffdb85b0b57a436e24;hpb=788316ef66136e6a68d881e5b24ccf5a98fa4550

diff --git a/service.c b/service.c
index 354099b..763c899 100644
--- a/service.c
+++ b/service.c
@@ -135,11 +135,10 @@ service_send_srv(struct uloop_fd *u, struct service *s)
 	if (len < 1)
 		return;
 
-	sd = malloc(len + sizeof(struct dns_srv_data));
+	sd = calloc(1, len + sizeof(struct dns_srv_data));
 	if (!sd)
 		return;
 
-	memset(sd, 0, sizeof(struct dns_srv_data));
 	sd->port = cpu_to_be16(s->port);
 	memcpy(&sd[1], buffer, len);
 	host = service_name(s->service);
@@ -262,16 +261,20 @@ service_load(char *path)
 			struct service *s;
 			char *d_service, *d_txt, *d_daemon;
 			int rem2;
+			int txt_len = 0;
 
 			blobmsg_parse(service_policy, ARRAY_SIZE(service_policy),
 				_tb, blobmsg_data(cur), blobmsg_data_len(cur));
 			if (!_tb[SERVICE_PORT] || !_tb[SERVICE_TXT])
 				continue;
 
+			blobmsg_for_each_attr(txt, _tb[SERVICE_TXT], rem2)
+				txt_len += 1 + strlen(blobmsg_get_string(txt));
+
 			s = calloc_a(sizeof(*s),
 				&d_daemon, strlen(gl.gl_pathv[i]) + 1,
 				&d_service, strlen(blobmsg_name(cur)) + 1,
-				&d_txt, blobmsg_data_len(_tb[SERVICE_TXT]));
+				&d_txt, txt_len);
 			if (!s)
 				continue;
 
@@ -283,18 +286,13 @@ service_load(char *path)
 			s->avl.key = s->service;
 			s->active = 1;
 			s->t = 0;
+			s->txt_len = txt_len;
+			s->txt = d_txt;
 			avl_insert(&services, &s->avl);
 
-			blobmsg_for_each_attr(txt, _tb[SERVICE_TXT], rem2)
-				s->txt_len += 1 + strlen(blobmsg_get_string(txt));
-
 			if (!s->txt_len)
 				continue;
 
-			d_txt = s->txt = malloc(s->txt_len);
-			if (!s->txt)
-				continue;
-
 			blobmsg_for_each_attr(txt, _tb[SERVICE_TXT], rem2) {
 				int len = strlen(blobmsg_get_string(txt));
 				if (!len)