From: Alexis Laferrière <alexis.laf@xymus.net>
Date: Mon, 22 Dec 2014 02:36:28 +0000 (-0500)
Subject: lib/socket: clean up `native_accept` to better manage failed accept
X-Git-Tag: v0.7~4^2~7
X-Git-Url: http://nitlanguage.org

lib/socket: clean up `native_accept` to better manage failed accept

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
---

diff --git a/lib/socket/socket_c.nit b/lib/socket/socket_c.nit
index df55638..5e1db3f 100644
--- a/lib/socket/socket_c.nit
+++ b/lib/socket/socket_c.nit
@@ -177,18 +177,21 @@ extern class NativeSocket `{ int* `}
 		return poll_return;
 	`}
 
-	private fun native_accept(addrIn: NativeSocketAddrIn): NativeSocket `{
+	private fun native_accept(addr_in: NativeSocketAddrIn): NativeSocket `{
 		socklen_t s = sizeof(struct sockaddr);
-		int *d = NULL;
-		d = malloc(sizeof(int));
-		*d = accept(*recv,(struct sockaddr*)addrIn, &s);
-		return d;
+		int socket = accept(*recv, (struct sockaddr*)addr_in, &s);
+		if (socket == -1) return NULL;
+
+		int *ptr = malloc(sizeof(int));
+		*ptr = socket;
+		return ptr;
 	`}
 
 	fun accept: nullable SocketAcceptResult
 	do
 		var addrIn = new NativeSocketAddrIn
 		var s = native_accept(addrIn)
+		if s.address_is_null then return null
 		return new SocketAcceptResult(s, addrIn)
 	end
 end