reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-12-04 01:41:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ws2_32: Don't try to receive data in an OOB_INLINED socket with MSG_OOB.

Browse Source
This commit is contained in:
Bruno Jesus 2015-03-29 00:53:11 -03:00 committed by Alexandre Julliard
parent f6a341c747
commit d73330e4d8
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/ws2_32/socket.c
View File

@ -6713,7 +6713,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
{ {
unsigned int i, options; unsigned int i, options;
int n, fd, err, overlapped; int n, fd, err, overlapped;
struct ws2_async *wsa, localwsa; struct ws2_async *wsa = NULL, localwsa;
BOOL is_blocking; BOOL is_blocking;
DWORD timeout_start = GetTickCount(); DWORD timeout_start = GetTickCount();
ULONG_PTR cvalue = (lpOverlapped && ((ULONG_PTR)lpOverlapped->hEvent & 1) == 0) ? (ULONG_PTR)lpOverlapped : 0; ULONG_PTR cvalue = (lpOverlapped && ((ULONG_PTR)lpOverlapped->hEvent & 1) == 0) ? (ULONG_PTR)lpOverlapped : 0;
@ -6728,6 +6728,18 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
if (fd == -1) return SOCKET_ERROR; if (fd == -1) return SOCKET_ERROR;
if (*lpFlags & WS_MSG_OOB)
{
/* It's invalid to receive OOB data from an OOBINLINED socket
* as OOB data is turned into normal data. */
i = sizeof(n);
if (!getsockopt(fd, SOL_SOCKET, SO_OOBINLINE, (char*) &n, &i) && n)
{
err = WSAEINVAL;
goto error;
}
}
overlapped = (lpOverlapped || lpCompletionRoutine) && overlapped = (lpOverlapped || lpCompletionRoutine) &&
!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT));
if (overlapped || dwBufferCount > 1) if (overlapped || dwBufferCount > 1)