oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Fix call to WSAStringToAddress()

Browse Source 
String argument to WSAStringToAddress() is not const, while argument
to inet_pton() is.  Create a non-const string for the purpose of
calling WSAStringToAddress()
This commit is contained in:
Asanka Herath
2010-06-03 00:51:45 -04:00
parent 3a8922fe2d
commit 6b0baa2a8d
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/roken/inet_pton.c
View File

@@ -38,8 +38,15 @@
#ifdef HAVE_WINSOCK #ifdef HAVE_WINSOCK
ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
inet_pton(int af, const char *src, void *dst) inet_pton(int af, const char *csrc, void *dst)
{ {
char * src;
if (csrc == NULL || (src = strdup(csrc)) == NULL) {
_set_errno( ENOMEM );
return 0;
}
switch (af) { switch (af) {
case AF_INET: case AF_INET:
{ {
@@ -49,6 +56,8 @@ inet_pton(int af, const char *src, void *dst)
si4.sin_family = AF_INET; si4.sin_family = AF_INET;
r = WSAStringToAddress(src, AF_INET, NULL, (LPSOCKADDR) &si4, &s); r = WSAStringToAddress(src, AF_INET, NULL, (LPSOCKADDR) &si4, &s);
free(src);
src = NULL;
if (r == 0) { if (r == 0) {
memcpy(dst, &si4.sin_addr, sizeof(si4.sin_addr)); memcpy(dst, &si4.sin_addr, sizeof(si4.sin_addr));
@@ -65,6 +74,8 @@ inet_pton(int af, const char *src, void *dst)
si6.sin6_family = AF_INET6; si6.sin6_family = AF_INET6;
r = WSAStringToAddress(src, AF_INET6, NULL, (LPSOCKADDR) &si6, &s); r = WSAStringToAddress(src, AF_INET6, NULL, (LPSOCKADDR) &si6, &s);
free(src);
src = NULL;
if (r == 0) { if (r == 0) {
memcpy(dst, &si6.sin6_addr, sizeof(si6.sin6_addr)); memcpy(dst, &si6.sin6_addr, sizeof(si6.sin6_addr));