Fix bug that causes messages like

    rsync: stack overflow in function match_address
on openbsd.  Patch from Brian Poole <raj@cerias.purdue.edu>.

1 files changed, 4 insertions, 5 deletions

diff --git a/access.c b/access.c
index d792eafd..b05059f9 100644
--- a/access.c
+++ b/access.c
@@ -51,7 +51,8 @@ static void make_mask(char *mask, int plen, int addrlen) {
 
 	if (w)
 		memset(mask, 0xff, w);
-	mask[w] = 0xff & (0xff<<(8-b));
+	if (w < addrlen)
+		mask[w] = 0xff & (0xff<<(8-b));
 	if (w+1 < addrlen)
 		memset(mask+w+1, 0, addrlen-w-1);
 
@@ -121,6 +122,8 @@ static int match_address(char *addr, char *tok)
 		a = (char *)&sin6a->sin6_addr;
 		t = (char *)&sin6t->sin6_addr;
 
+		addrlen = 16;
+
 #ifdef HAVE_SOCKADDR_IN6_SCOPE_ID
 		if (sin6t->sin6_scope_id &&
 		    sin6a->sin6_scope_id != sin6t->sin6_scope_id) {
@@ -129,10 +132,6 @@ static int match_address(char *addr, char *tok)
 		}
 #endif
 
-		a = (char *)&sin6a->sin6_addr;
-		t = (char *)&sin6t->sin6_addr;
-		addrlen = 16;
-
 		break;
 	    }
 #endif