ape: check *alen before copying in getpeername(), getsockname() and accept()

*alen has to be initialized to the size of the buffer
by the caller, and we are supposed to put the real
size of the address in there, but not copy more than
the original *alen value (truncate).

1 files changed, 9 insertions, 10 deletions

diff --git a/sys/src/ape/lib/bsd/accept.c b/sys/src/ape/lib/bsd/accept.c
index 4f6203652..7a087c590 100644
--- a/sys/src/ape/lib/bsd/accept.c
+++ b/sys/src/ape/lib/bsd/accept.c
@@ -62,14 +62,8 @@ accept(int fd, void *a, int *alen)
 			close(nfd);
 			return -1;
 		}
-		/* get remote address */
-		_sock_ingetaddr(nr, &nr->raddr, &n, "remote");
-		if(a != 0){
-			if(n > 0)
-				memmove(a, &nr->raddr, n);
-			*alen = n;
-		}
-		return nfd;
+		_sock_ingetaddr(nr, &nr->raddr, 0, "remote");	
+		break;
 	case PF_UNIX:
 		if(r->other >= 0){
 			errno = EGREG;
@@ -106,10 +100,15 @@ accept(int fd, void *a, int *alen)
 		nr->domain = r->domain;
 		nr->stype = r->stype;
 		nr->protocol = r->protocol;
-
-		return nfd;
+		nr->raddr = r->addr;
+		break;
 	default:
 		errno = EOPNOTSUPP;
 		return -1;
 	}
+
+	if(a != 0)
+		getpeername(nfd, a, alen);
+
+	return nfd;
 }