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

Merge pull request #77 from Boris-Barboris/manualevent_overflow

Browse source 
fix integer overflow protection absence for LocalManualEvent
This commit is contained in:
Sönke Ludwig 2018-04-08 17:21:14 +02:00 committed by GitHub
parent 09c21e98a9 788973f628
commit d4c5620d70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
source/vibe/core/sync.d
View file

@ -743,8 +743,8 @@ struct LocalManualEvent {
*/ */
int wait() { return wait(this.emitCount); } int wait() { return wait(this.emitCount); }
/** Acquires ownership and waits until the emit count differs from the /** Acquires ownership and waits until the signal is emitted and the emit
given one or until a timeout is reached. count is larger than a given one.
Throws: Throws:
May throw an $(D InterruptException) if the task gets interrupted May throw an $(D InterruptException) if the task gets interrupted
@ -778,7 +778,7 @@ struct LocalManualEvent {
target_timeout = now + timeout; 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); m_waiter.wait!interruptible(timeout != Duration.max ? target_timeout - now : Duration.max);
try now = Clock.currTime(UTC()); try now = Clock.currTime(UTC());
catch (Exception e) { assert(false, e.msg); } catch (Exception e) { assert(false, e.msg); }
@ -805,6 +805,22 @@ unittest {
runEventLoop(); 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 unittest { // ensure that cancelled waiters are properly handled and that a FIFO order is implemented
import vibe.core.core : exitEventLoop, runEventLoop, runTask, sleep; import vibe.core.core : exitEventLoop, runEventLoop, runTask, sleep;
@ -1011,8 +1027,8 @@ struct ManualEvent {
int ec = this.emitCount; int ec = this.emitCount;
acquireThreadWaiter((scope ThreadWaiter w) { acquireThreadWaiter((scope ThreadWaiter w) {
while (ec <= emit_count) { while (ec - emit_count <= 0) {
w.wait!interruptible(timeout != Duration.max ? target_timeout - now : Duration.max, ms_threadEvent, () => this.emitCount > emit_count); w.wait!interruptible(timeout != Duration.max ? target_timeout - now : Duration.max, ms_threadEvent, () => (this.emitCount - emit_count) > 0);
ec = this.emitCount; ec = this.emitCount;
if (timeout != Duration.max) { if (timeout != Duration.max) {