Merge pull request #902 from saurtron/fix-unsafe-socket-usage-zk

Fix socket leaks and bad error condition checks.

Author: GoogleFrog

LuaMenu/widgets/zk_loopback.lua

@@ -48,10 +48,13 @@ function SendCommand(cmdName, args)
 end
 
 local function SocketConnect(host, port)
+	if client then
+		client:close()
+	end
 	client=socket.tcp()
 	client:settimeout(0)
 	res, err = client:connect(host, port)
-	if not res and not res=="timeout" then
+	if not res and err ~= "timeout" then
 		Echo("Error in connect wrapper: "..err)
 		return false
 	end

libs/liblobby/lobby/interface_shared.lua

@@ -61,6 +61,7 @@ function Interface:Disconnect()
 	self.finishedConnecting = false
 	if self.client then
 		self.client:close()
+		self.client = nil
 	end
 	self:_OnDisconnected(nil, true)
 end

libs/spring-launcher/luaui/widgets/api_spring_launcher.lua

@@ -89,10 +89,15 @@ local function explode(div,str)
 end
 
 function widget:SocketConnect()
+	if client then
+		client:close()
+	end
 	client = socket.tcp()
 	client:settimeout(0)
 	local res, err = client:connect(host, port)
-	if not res and not res == "timeout" then
+	if not res and err ~= "timeout" then
+		client:close()
+		client = nil
 		widgetHandler:RemoveWidget(self)
 		Spring.Log(LOG_SECTION, LOG.ERROR, "Error in connect launcher: " .. err)
 		return false