danbarber/persephone
1
1
Fork 0
mirror of https://github.com/danbee/persephone synced 2025-03-04 08:39:11 +00:00
Code Issues Releases Wiki Activity

Woops, we were reading this outside of the lock!

Browse Source
This commit is contained in:
Daniel Barber 2020-02-15 12:24:09 -05:00
parent fa338ee790
commit 2f59eaeecf
Signed by: danbarber
GPG Key ID: 931D8112E0103DD8
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Persephone/MPDClient/Extensions/MPDClient+Idle.swift
View File

@ -11,10 +11,10 @@ import mpdclient
extension MPDClient { extension MPDClient {
func noIdle() { func noIdle() {
if isIdle { do {
do { idleLock.lock()
idleLock.lock() defer { idleLock.unlock() }
defer { idleLock.unlock() } if isIdle {
mpd_send_noidle(connection) mpd_send_noidle(connection)
isIdle = false isIdle = false
} }
@ -22,14 +22,21 @@ extension MPDClient {
} }
func idle(_ force: Bool = false) { func idle(_ force: Bool = false) {
if (!self.isIdle && self.commandQueue.operationCount == 1) || force { let shouldIdle: Bool
do {
idleLock.lock() do {
defer { idleLock.unlock() } idleLock.lock()
defer { idleLock.unlock() }
shouldIdle = (!self.isIdle && self.commandQueue.operationCount == 1) || force
if shouldIdle {
mpd_send_idle(self.connection) mpd_send_idle(self.connection)
self.isIdle = true self.isIdle = true
} }
}
// noIdle could happen here which will crash
if shouldIdle {
let result = mpd_recv_idle(self.connection, true) let result = mpd_recv_idle(self.connection, true)
self.handleIdleResult(result) self.handleIdleResult(result)
} }