Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Murmur: fix MurmurDBus::addChannel that was broken by Murmur's new locking. #2393

Merged
merged 1 commit into from Jul 3, 2016

Conversation

@mkrautz
Copy link
Member

commented Jul 3, 2016

This method was broken by commit f260bd1.

In particular, the line:

Channel *nc = server->addChannel(cChannel, name);

was removed by a locked block:

{
    QWriteLocker wl(&server->qrwlVoiceThread);
    server->addChannel(cChannel, name);
}

Note that nc is never assigned in the locked block.

See
f260bd1#diff-a6537e937b1df62a77d014d7a8c3008bL377
for the full diff.

Fixes #2392

Murmur: fix MurmurDBus::addChannel that was broken by Murmur's new lo…
…cking.

This method was broken by commit f260bd1.

In particular, the line:

    Channel *nc = server->addChannel(cChannel, name);

was removed by a locked block:

    {
        QWriteLocker wl(&server->qrwlVoiceThread);
        server->addChannel(cChannel, name);
    }

Note that nc is never assigned in the locked block.

See
f260bd1#diff-a6537e937b1df62a77d014d7a8c3008bL377
for the full diff.

Fixes #2392
@mkrautz

This comment has been minimized.

Copy link
Member Author

commented Jul 3, 2016

@fwaggle

This comment has been minimized.

Copy link
Contributor

commented Jul 3, 2016

LGTM, but probably didn't even need to be blocked it's that obvious. 👍

@mkrautz mkrautz merged commit f45c1f7 into mumble-voip:master Jul 3, 2016

mkrautz added a commit that referenced this pull request Jul 3, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.