X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=inline;f=src%2Fnetwork%2Fdn_expand.c;h=4e02e3d27382b449185da382b8bb0be6e112d2ad;hb=d1a2ead878c27ac4ec600740320f8b76e1f961e9;hp=72a80e82a6f98273c33573221315f62b1daa5903;hpb=fcc522c92335783293ac19df318415cd97fbf66b;p=musl

diff --git a/src/network/dn_expand.c b/src/network/dn_expand.c
index 72a80e82..4e02e3d2 100644
--- a/src/network/dn_expand.c
+++ b/src/network/dn_expand.c
@@ -6,7 +6,7 @@ int __dn_expand(const unsigned char *base, const unsigned char *end, const unsig
 	const unsigned char *p = src;
 	int len = -1, j;
 	if (space > 256) space = 256;
-	if (p==end) return -1;
+	if (p==end || !*p) return -1;
 	for (;;) {
 		if (*p & 0xc0) {
 			if (p+1==end) return -1;
@@ -16,11 +16,13 @@ int __dn_expand(const unsigned char *base, const unsigned char *end, const unsig
 			p = base+j;
 		} else if (*p) {
 			j = *p+1;
-			if (len < 0) len = p+1-src;
 			if (j>=end-p || j>space) return -1;
-			while (--j) *dest++ = *p++;
+			while (--j) *dest++ = *++p;
 			*dest++ = *++p ? '.' : 0;
-		} else return len;
+		} else {
+			if (len < 0) len = p+1-src;
+			return len;
+		}
 	}
 }