Merge pull request #940 from SaberUK/insp20+fix-makefile

[user/henk/code/inspircd.git] / win / inspircd_win32wrapper.cpp

diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp
index 048baf38be99a7ea2b9dcc8ed5dfd5745637b99e..d66797f139a5a09665ea38b50fa88358401a7ba9 100644 (file)
--- a/win/inspircd_win32wrapper.cpp
+++ b/win/inspircd_win32wrapper.cpp
@@ -38,8 +38,8 @@ CoreExport const char *insp_inet_ntop(int af, const void *src, char *dst, sockle
                memset(&in, 0, sizeof(in));
                in.sin_family = AF_INET;
                memcpy(&in.sin_addr, src, sizeof(struct in_addr));
-               getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in), dst, cnt, NULL, 0, NI_NUMERICHOST);
-               return dst;
+               if (getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in), dst, cnt, NULL, 0, NI_NUMERICHOST) == 0)
+                       return dst;
        }
        else if (af == AF_INET6)
        {
@@ -47,8 +47,8 @@ CoreExport const char *insp_inet_ntop(int af, const void *src, char *dst, sockle
                memset(&in, 0, sizeof(in));
                in.sin6_family = AF_INET6;
                memcpy(&in.sin6_addr, src, sizeof(struct in_addr6));
-               getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in6), dst, cnt, NULL, 0, NI_NUMERICHOST);
-               return dst;
+               if (getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in6), dst, cnt, NULL, 0, NI_NUMERICHOST) == 0)
+                       return dst;
        }
        return NULL;
 }
@@ -205,6 +205,11 @@ CWin32Exception::CWin32Exception() : exception()
        dwErrorCode = GetLastError();
        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);
+       for (size_t i = 0; i < _countof(szErrorString); i++)
+       {
+               if ((szErrorString[i] == '\r') || (szErrorString[i] == '\n'))
+                       szErrorString[i] = 0;
+       }
 }
 
 CWin32Exception::CWin32Exception(const CWin32Exception& other)