Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
d73330e4
Commit
d73330e4
authored
Mar 29, 2015
by
Bruno Jesus
Committed by
Alexandre Julliard
Mar 30, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ws2_32: Don't try to receive data in an OOB_INLINED socket with MSG_OOB.
parent
f6a341c7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
1 deletion
+13
-1
socket.c
dlls/ws2_32/socket.c
+13
-1
No files found.
dlls/ws2_32/socket.c
View file @
d73330e4
...
...
@@ -6713,7 +6713,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
{
unsigned
int
i
,
options
;
int
n
,
fd
,
err
,
overlapped
;
struct
ws2_async
*
wsa
,
localwsa
;
struct
ws2_async
*
wsa
=
NULL
,
localwsa
;
BOOL
is_blocking
;
DWORD
timeout_start
=
GetTickCount
();
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
(
*
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
)
&&
!
(
options
&
(
FILE_SYNCHRONOUS_IO_ALERT
|
FILE_SYNCHRONOUS_IO_NONALERT
));
if
(
overlapped
||
dwBufferCount
>
1
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment