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

Fix two possible causes for range violations in the WinAPI handle map.

Browse source
This commit is contained in:
Sönke Ludwig 2018-03-30 16:57:45 +02:00
parent 811ae63698
commit 242432c416
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/eventcore/drivers/winapi/core.d
View file

@ -170,8 +170,10 @@ final class WinAPIEventDriverCore : EventDriverCore {
auto ret = () @trusted { return MsgWaitForMultipleObjectsEx(cast(DWORD)m_registeredEvents.length, m_registeredEvents.ptr, auto ret = () @trusted { return MsgWaitForMultipleObjectsEx(cast(DWORD)m_registeredEvents.length, m_registeredEvents.ptr,
timeout_msecs, QS_ALLEVENTS, MWMO_ALERTABLE|MWMO_INPUTAVAILABLE); } (); timeout_msecs, QS_ALLEVENTS, MWMO_ALERTABLE|MWMO_INPUTAVAILABLE); } ();
foreach (evt; m_ioEvents.consume) while (!m_ioEvents.empty) {
auto evt = m_ioEvents.consumeOne();
evt.process(evt.error, evt.bytesTransferred, evt.overlapped); evt.process(evt.error, evt.bytesTransferred, evt.overlapped);
}
if (ret == WAIT_IO_COMPLETION) got_event = true; if (ret == WAIT_IO_COMPLETION) got_event = true;
else if (ret >= WAIT_OBJECT_0 && ret < WAIT_OBJECT_0 + m_registeredEvents.length) { else if (ret >= WAIT_OBJECT_0 && ret < WAIT_OBJECT_0 + m_registeredEvents.length) {

1
source/eventcore/drivers/winapi/files.d
View file

@ -204,6 +204,7 @@ final class WinAPIEventDriverFiles : EventDriverFiles {
{ {
FileFD id = cast(FileFD)cast(size_t)overlapped.hEvent; FileFD id = cast(FileFD)cast(size_t)overlapped.hEvent;
auto handle = idToHandle(id); auto handle = idToHandle(id);
if (handle == INVALID_HANDLE_VALUE) return;
static if (RO) static if (RO)
auto slot = () @trusted { return &overlapped.driver.m_handles[handle].file.write; } (); auto slot = () @trusted { return &overlapped.driver.m_handles[handle].file.write; } ();
else else