arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Provide temporary buffer for WSAStringToAddress 

Also see http://stackoverflow.com/q/39952781
pull/326/head
Jeffrey Walton 2016-10-10 13:56:52 -04:00
parent 818a4ea631
commit ecb62a9311
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
socketft.cpp
View File

@ -51,10 +51,15 @@ const int SOCKET_EWOULDBLOCK = EWOULDBLOCK;
#endif /* INADDR_NONE */ #endif /* INADDR_NONE */
// Some Windows SDKs do not have INET6_ADDRSTRLEN // Some Windows SDKs do not have INET6_ADDRSTRLEN
#ifndef INET_ADDRSTRLEN
# define INET_ADDRSTRLEN (22)
#endif
#ifndef INET6_ADDRSTRLEN #ifndef INET6_ADDRSTRLEN
# define INET6_ADDRSTRLEN (65) # define INET6_ADDRSTRLEN (65)
#endif #endif
#define MAX_ADDRSTRLEN (INET6_ADDRSTRLEN > INET_ADDRSTRLEN ? INET6_ADDRSTRLEN : INET_ADDRSTRLEN)
#if defined(CRYPTOPP_WIN32_AVAILABLE) #if defined(CRYPTOPP_WIN32_AVAILABLE)
// http://stackoverflow.com/a/20816961 // http://stackoverflow.com/a/20816961
int inet_pton(int af, const char *src, void *dst) int inet_pton(int af, const char *src, void *dst)
@ -68,10 +73,19 @@ int inet_pton(int af, const char *src, void *dst)
if(!src || !dst) return 0; if(!src || !dst) return 0;
struct sockaddr_storage ss; struct sockaddr_storage ss;
int size = sizeof(ss);
ZeroMemory(&ss, sizeof(ss)); ZeroMemory(&ss, sizeof(ss));
if (WSAStringToAddress(const_cast<LPSTR>(src), af, NULL, (struct sockaddr *)&ss, &size) == 0) {
#if CRYPTOPP_MSC_VERSION >= 1400
char temp[MAX_ADDRSTRLEN];
strcpy_s(temp, sizeof(temp), src);
#else
char temp[MAX_ADDRSTRLEN];
strncpy(temp, src, sizeof(temp));
#endif
int size = sizeof(ss);
if (WSAStringToAddress(temp, af, NULL, (struct sockaddr *)&ss, &size) == 0) {
switch (af) { switch (af) {
case AF_INET: case AF_INET:
*(struct in_addr *)dst = ((struct sockaddr_in *)&ss)->sin_addr; *(struct in_addr *)dst = ((struct sockaddr_in *)&ss)->sin_addr;