Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 06:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSAFD] Fix for WSPStringToAddressA/W wine tests. CORE-12104

Browse source 
svn path=/trunk/; revision=73192
This commit is contained in:
Peter Hater 2016-11-10 11:15:14 +00:00
parent d26b1ff847
commit a32e890392
1 changed files with 54 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

80
reactos/dll/win32/msafd/misc/dllmain.c
View file

@ -2898,8 +2898,9 @@ WSPStringToAddress(IN LPWSTR AddressString,
IN OUT LPINT lpAddressLength, IN OUT LPINT lpAddressLength,
OUT LPINT lpErrno) OUT LPINT lpErrno)
{ {
int pos = 0; int numdots = 0;
LONG inetaddr = 0; USHORT port;
LONG inetaddr = 0, ip_part;
LPWSTR *bp = NULL; LPWSTR *bp = NULL;
SOCKADDR_IN *sockaddr; SOCKADDR_IN *sockaddr;
@ -2926,47 +2927,74 @@ WSPStringToAddress(IN LPWSTR AddressString,
{ {
if (*lpAddressLength < (INT)sizeof(SOCKADDR_IN)) if (*lpAddressLength < (INT)sizeof(SOCKADDR_IN))
{ {
*lpAddressLength = sizeof(SOCKADDR_IN);
if (lpErrno) *lpErrno = WSAEFAULT; if (lpErrno) *lpErrno = WSAEFAULT;
} }
else else
{ {
// translate ip string to ip // translate ip string to ip
/* rest sockaddr.sin_addr.s_addr /* Get ip number */
for we need to be sure it is zero when we come to while */ bp = &AddressString;
memset(lpAddress, 0, sizeof(SOCKADDR_IN)); inetaddr = 0;
/* Set right adress family */ while (*bp < &AddressString[wcslen(AddressString)])
sockaddr->sin_family = AF_INET; {
ip_part = wcstol(*bp, bp, 10);
/* ip part number should be in range 0-255 */
if (ip_part < 0 || ip_part > 255)
{
if (lpErrno) *lpErrno = WSAEINVAL;
return SOCKET_ERROR;
}
inetaddr = (inetaddr << 8) + ip_part;
/* we end on string end or port separator */
if ((*bp)[0] == 0 || (*bp)[0] == L':')
break;
/* ip parts are dot separated. verify it */
if ((*bp)[0] != L'.')
{
if (lpErrno) *lpErrno = WSAEINVAL;
return SOCKET_ERROR;
}
/* count the dots */
numdots++;
/* move over the dot to next ip part */
(*bp)++;
}
/* check dots count */
if (numdots != 3)
{
if (lpErrno) *lpErrno = WSAEINVAL;
return SOCKET_ERROR;
}
/* Get port number */ /* Get port number */
pos = wcscspn(AddressString, L":") + 1; if ((*bp)[0] == L':')
if (pos < (int)wcslen(AddressString))
{ {
sockaddr->sin_port = wcstol(&AddressString[pos], bp, 10); /* move over the column to port part */
(*bp)++;
/* next char should be numeric */
if ((*bp)[0] < L'0' || (*bp)[0] > L'9')
{
if (lpErrno) *lpErrno = WSAEINVAL;
return SOCKET_ERROR;
}
port = wcstol(*bp, bp, 10);
} }
else else
{ {
sockaddr->sin_port = 0; port = 0;
}
/* Get ip number */
pos = 0;
inetaddr = 0;
while (pos < (int)wcslen(AddressString))
{
inetaddr = (inetaddr << 8) +
((UCHAR)wcstol(&AddressString[pos], bp, 10));
pos += wcscspn(&AddressString[pos], L".") + 1;
} }
if (lpErrno) *lpErrno = NO_ERROR; if (lpErrno) *lpErrno = NO_ERROR;
/* rest sockaddr.sin_addr.s_addr
for we need to be sure it is zero when we come to while */
*lpAddressLength = sizeof(*sockaddr);
memset(lpAddress, 0, sizeof(*sockaddr));
sockaddr->sin_family = AF_INET;
sockaddr->sin_addr.s_addr = inetaddr; sockaddr->sin_addr.s_addr = inetaddr;
sockaddr->sin_port = port;
} }
} }