X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fnetwork%2Fdns_parse.c;h=320df60d9cd5d99b05b4a29c7700c7084cb30e08;hb=12590c8bbd04ea484cee86812e2258fbdfca0e59;hp=e6ee19d9a6f88d0608cc43eb438c70d35813a78b;hpb=bc695a5ac1d7929e5c1ad5297eb47e146cccd157;p=musl

diff --git a/src/network/dns_parse.c b/src/network/dns_parse.c
index e6ee19d9..320df60d 100644
--- a/src/network/dns_parse.c
+++ b/src/network/dns_parse.c
@@ -15,17 +15,17 @@ int __dns_parse(const unsigned char *r, int rlen, int (*callback)(void *, int, c
 	if (qdcount+ancount > 64) return -1;
 	while (qdcount--) {
 		while (p-r < rlen && *p-1U < 127) p++;
-		if (*p>193 || (*p==193 && p[1]>254) || p>r+rlen-6)
+		if (p>r+rlen-6 || *p>193 || (*p==193 && p[1]>254))
 			return -1;
 		p += 5 + !!*p;
 	}
 	while (ancount--) {
 		while (p-r < rlen && *p-1U < 127) p++;
-		if (*p>193 || (*p==193 && p[1]>254) || p>r+rlen-6)
+		if (p>r+rlen-12 || *p>193 || (*p==193 && p[1]>254))
 			return -1;
 		p += 1 + !!*p;
 		len = p[8]*256 + p[9];
-		if (p+len > r+rlen) return -1;
+		if (len+10 > r+rlen-p) return -1;
 		if (callback(ctx, p[1], p+10, len, r) < 0) return -1;
 		p += 10 + len;
 	}