From fd7566b5de6b59bb18ff380cb1fa3f3f1089b70b Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 17 Jan 2017 16:08:58 +0300
Subject: code cleaning

---
 src/mir_app/src/netlibbind.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/mir_app')

diff --git a/src/mir_app/src/netlibbind.cpp b/src/mir_app/src/netlibbind.cpp
index bbc9c6fee3..ad7c160bbe 100644
--- a/src/mir_app/src/netlibbind.cpp
+++ b/src/mir_app/src/netlibbind.cpp
@@ -179,9 +179,10 @@ MIR_APP_DLL(HNETLIBBIND) Netlib_BindPort(HNETLIBUSER nlu, NETLIBBIND *nlb)
 		return nullptr;
 	}
 
-	NetlibBoundPort *nlbp = (NetlibBoundPort*)mir_calloc(sizeof(NetlibBoundPort));
+	NetlibBoundPort *nlbp = new NetlibBoundPort(nlu, nlb);
 	if (nlbp->s == INVALID_SOCKET && nlbp->s6 == INVALID_SOCKET) {
 		Netlib_Logf(nlu, "%s %d: %s() failed (%u)", __FILE__, __LINE__, "socket", WSAGetLastError());
+LBL_Error:
 		delete nlbp;
 		return nullptr;
 	}
@@ -226,9 +227,7 @@ MIR_APP_DLL(HNETLIBBIND) Netlib_BindPort(HNETLIBUSER nlu, NETLIBBIND *nlb)
 	}
 	if (!foundPort) {
 		Netlib_Logf(nlu, "%s %d: %s() failed (%u)", __FILE__, __LINE__, "bind", WSAGetLastError());
-LBL_Error:
-		delete nlbp;
-		return nullptr;
+		goto LBL_Error;
 	}
 
 	if (nlbp->s != INVALID_SOCKET && listen(nlbp->s, 5)) {
@@ -300,6 +299,8 @@ NetlibBoundPort::NetlibBoundPort(HNETLIBUSER _nlu, NETLIBBIND *nlb)
 
 NetlibBoundPort::~NetlibBoundPort()
 {
-	closesocket(s);
-	closesocket(s6);
+	if (s != INVALID_SOCKET)
+		closesocket(s);
+	if (s6 != INVALID_SOCKET)
+		closesocket(s6);
 }
-- 
cgit v1.2.3