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

Merge pull request #180 from vibe-d/fix_yieldlock_destruction

Browse source 
Make sure that an uninitialized YieldLock does not decrement the lock counter
merged-on-behalf-of: Sönke Ludwig <s-ludwig@users.noreply.github.com>
This commit is contained in:
The Dlang Bot 2019-09-27 16:51:56 +02:00 committed by GitHub
parent 24a83434e4 aae2c28ef6
commit b976519057
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
source/vibe/core/core.d
View file

@ -1201,12 +1201,12 @@ private struct TimerCallbackHandler(CALLABLE) {
auto yieldLock() auto yieldLock()
@safe nothrow { @safe nothrow {
static struct YieldLock { static struct YieldLock {
@safe nothrow: @safe nothrow:
private bool m_initialized;
private this(bool) { inc(); } private this(bool) { m_initialized = true; inc(); }
@disable this();
@disable this(this); @disable this(this);
~this() { dec(); } ~this() { if (m_initialized) dec(); }
private void inc() private void inc()
{ {
@ -1215,6 +1215,7 @@ auto yieldLock()
private void dec() private void dec()
{ {
assert(TaskFiber.getThis().m_yieldLockCount > 0);
TaskFiber.getThis().m_yieldLockCount--; TaskFiber.getThis().m_yieldLockCount--;
} }
} }
@ -1235,6 +1236,12 @@ unittest {
assert(tf.m_yieldLockCount == 1); assert(tf.m_yieldLockCount == 1);
} }
assert(tf.m_yieldLockCount == 0); assert(tf.m_yieldLockCount == 0);
{
typeof(yieldLock()) l;
assert(tf.m_yieldLockCount == 0);
}
assert(tf.m_yieldLockCount == 0);
} }