debian-packages/eventcore
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Clear WSA buffers to make sure to detect erroneous accesses.

Browse source
This commit is contained in:
Sönke Ludwig 2018-09-04 10:43:27 +02:00
parent 491e100ef5
commit 87fb595aee
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/eventcore/drivers/winapi/sockets.d
View file

@ -243,6 +243,8 @@ final class WinAPIEventDriverSockets : EventDriverSockets {
slot.read.wsabuf[0].len = buffer.length; slot.read.wsabuf[0].len = buffer.length;
slot.read.wsabuf[0].buf = () @trusted { return buffer.ptr; } (); slot.read.wsabuf[0].buf = () @trusted { return buffer.ptr; } ();
void resetBuffers() { slot.read.buffer = null; slot.read.wsabuf[0] = WSABUF.init; }
auto ovl = mode == IOMode.immediate ? null : &slot.read.overlapped.overlapped; auto ovl = mode == IOMode.immediate ? null : &slot.read.overlapped.overlapped;
DWORD flags = 0; DWORD flags = 0;
auto handler = &overlappedIOHandler!(onIOReadCompleted, DWORD); auto handler = &overlappedIOHandler!(onIOReadCompleted, DWORD);
@ -251,10 +253,12 @@ final class WinAPIEventDriverSockets : EventDriverSockets {
auto err = WSAGetLastError(); auto err = WSAGetLastError();
if (err == WSA_IO_PENDING) { if (err == WSA_IO_PENDING) {
if (mode == IOMode.immediate) { if (mode == IOMode.immediate) {
resetBuffers();
on_read_finish(socket, IOStatus.wouldBlock, 0); on_read_finish(socket, IOStatus.wouldBlock, 0);
return; return;
} }
} else { } else {
resetBuffers();
on_read_finish(socket, IOStatus.error, 0); on_read_finish(socket, IOStatus.error, 0);
return; return;
} }
@ -277,6 +281,8 @@ final class WinAPIEventDriverSockets : EventDriverSockets {
slot.common.core.removeWaiter(); slot.common.core.removeWaiter();
auto cb = slot.streamSocket.read.callback; auto cb = slot.streamSocket.read.callback;
slot.streamSocket.read.callback = null; slot.streamSocket.read.callback = null;
slot.streamSocket.read.buffer = null;
slot.streamSocket.read.wsabuf[0] = WSABUF.init;
if (slot.common.driver.releaseRef(cast(StreamSocketFD)slot.common.fd)) if (slot.common.driver.releaseRef(cast(StreamSocketFD)slot.common.fd))
cb(cast(StreamSocketFD)slot.common.fd, status, nsent); cb(cast(StreamSocketFD)slot.common.fd, status, nsent);
} }
@ -562,6 +568,8 @@ final class WinAPIEventDriverSockets : EventDriverSockets {
slot.common.core.removeWaiter(); slot.common.core.removeWaiter();
auto cb = slot.datagramSocket.read.callback; auto cb = slot.datagramSocket.read.callback;
slot.datagramSocket.read.callback = null; slot.datagramSocket.read.callback = null;
slot.datagramSocket.read.buffer = null;
slot.datagramSocket.read.wsabuf = WSABUF.init;
scope addr = new RefAddress(cast(sockaddr*)&slot.datagramSocket.sourceAddr, slot.datagramSocket.sourceAddrLen); scope addr = new RefAddress(cast(sockaddr*)&slot.datagramSocket.sourceAddr, slot.datagramSocket.sourceAddrLen);
if (slot.common.driver.releaseRef(cast(DatagramSocketFD)slot.common.fd)) if (slot.common.driver.releaseRef(cast(DatagramSocketFD)slot.common.fd))
cb(cast(DatagramSocketFD)slot.common.fd, status, nsent, status == IOStatus.ok ? addr : null); cb(cast(DatagramSocketFD)slot.common.fd, status, nsent, status == IOStatus.ok ? addr : null);
@ -919,6 +927,8 @@ static struct StreamDirection(bool RO) {
size_t bytesTransferred; size_t bytesTransferred;
IOMode mode; IOMode mode;
IOCallback callback; IOCallback callback;
void reset() { buffer = null; wsabuf[0] = WSABUF.init; callback = null; }
} }
private struct StreamListenSocketSlot { private struct StreamListenSocketSlot {
@ -943,4 +953,6 @@ static struct DgramDirection(bool RO) {
size_t bytesTransferred; size_t bytesTransferred;
IOMode mode; IOMode mode;
DatagramIOCallback callback; DatagramIOCallback callback;
void reset() { buffer = null; wsabuf[0] = WSABUF.init; callback = null; }
} }