X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengine.cpp;h=1c91ccdea0c37f52d6cb5d1ac2c8469bd79004aa;hb=7492344e64491cea6bbb5c9354dceb804bb908ac;hp=86608f0a31d90c4461020916ae0541deb844c99d;hpb=f71e6bf9cb41811f18864f5d4eecb26e29d03f25;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index 86608f0a3..1c91ccdea 100644
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -136,7 +136,7 @@ bool SocketEngine::BoundsCheckFd(EventHandler* eh)
 {
 	if (!eh)
 		return false;
-	if ((eh->GetFd() < 0) || (eh->GetFd() > GetMaxFds()))
+	if (eh->GetFd() < 0)
 		return false;
 	return true;
 }
@@ -291,7 +291,13 @@ std::string SocketEngine::LastError()
 	DWORD dwErrorCode = WSAGetLastError();
 	if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)szErrorString, _countof(szErrorString), NULL) == 0)
 		sprintf_s(szErrorString, _countof(szErrorString), "Error code: %u", dwErrorCode);
-	return szErrorString;
+
+	std::string::size_type p;
+	std::string ret = szErrorString;
+	while ((p = ret.find_last_of("\r\n")) != std::string::npos)
+		ret.erase(p, 1);
+
+	return ret;
 #endif
 }