fixing overrelease and out-of-bounds write, fixes #13725

[wxWidgets.git] / src / common / sckaddr.cpp

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index 0e1a95c96e53d92007d14644063d63ad1fc66cae..ec572a2adb26a7fbab000ca68cad1a18c7e25164 100644 (file)
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -37,9 +37,7 @@
     #include <stdlib.h>
     #include <ctype.h>
 
     #include <stdlib.h>
     #include <ctype.h>
 

-    #if !defined(__MWERKS__)
-        #include <memory.h>
-    #endif
+    #include <memory.h>

 #endif // !WX_PRECOMP
 
 #include "wx/socket.h"
 #endif // !WX_PRECOMP
 
 #include "wx/socket.h"


@@ -49,7 +47,7 @@
 
 #include <errno.h>
 
 
 #include <errno.h>
 

-#if defined(__UNIX__) && !defined(__CYGWIN__)
+#if defined(__UNIX__) && !defined(__WXMSW__)

     #include <netdb.h>
     #include <arpa/inet.h>
 #endif // __UNIX__
     #include <netdb.h>
     #include <arpa/inet.h>
 #endif // __UNIX__


@@ -79,7 +77,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 // TODO: use POSIX getaddrinfo() (also available in Winsock 2) for simplicity
 //       and to use the same code for IPv4 and IPv6 support
 
 // TODO: use POSIX getaddrinfo() (also available in Winsock 2) for simplicity
 //       and to use the same code for IPv4 and IPv6 support
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

     #define HAVE_INET_ADDR
 
     #ifndef HAVE_GETHOSTBYNAME
     #define HAVE_INET_ADDR
 
     #ifndef HAVE_GETHOSTBYNAME


@@ -109,7 +107,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
             #pragma warning(default:4706)
         #endif
     #endif
             #pragma warning(default:4706)
         #endif
     #endif

-#endif // __WXMSW__
+#endif // __WINDOWS__

 
 // we assume that we have gethostbyaddr_r() if and only if we have
 // gethostbyname_r() and that it uses the similar conventions to it (see
 
 // we assume that we have gethostbyaddr_r() if and only if we have
 // gethostbyname_r() and that it uses the similar conventions to it (see