From a840c51c5dbe4e9408a9471a56d11f9d5dd34499 Mon Sep 17 00:00:00 2001 From: Boris-Barboris Date: Fri, 30 Mar 2018 09:11:30 +0000 Subject: [PATCH] fix integer overflow protection absence for LocalManualEvent --- source/vibe/core/sync.d | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/source/vibe/core/sync.d b/source/vibe/core/sync.d index edee964..0c2caa4 100644 --- a/source/vibe/core/sync.d +++ b/source/vibe/core/sync.d @@ -778,7 +778,7 @@ struct LocalManualEvent { target_timeout = now + timeout; } - while (m_waiter.m_emitCount <= emit_count) { + while (m_waiter.m_emitCount - emit_count > 0) { m_waiter.wait!interruptible(timeout != Duration.max ? target_timeout - now : Duration.max); try now = Clock.currTime(UTC()); catch (Exception e) { assert(false, e.msg); } @@ -805,6 +805,22 @@ unittest { runEventLoop(); } +unittest { + import vibe.core.core : exitEventLoop, runEventLoop, runTask, sleep; + auto e = createManualEvent(); + // integer overflow test + e.m_waiter.m_emitCount = int.max; + auto w1 = runTask({ e.wait(50.msecs, e.emitCount); }); + runTask({ + sleep(5.msecs); + e.emit(); + sleep(50.msecs); + assert(!w1.running); + exitEventLoop(); + }); + runEventLoop(); +} + unittest { // ensure that cancelled waiters are properly handled and that a FIFO order is implemented import vibe.core.core : exitEventLoop, runEventLoop, runTask, sleep;