preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-28 09:45:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add safety check in prio work queue

Browse Source
This commit is contained in:
Henrik Rydgard
2013-04-14 12:24:28 +02:00
parent 345180dcef
commit 0d0ed1256b
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
thread/prioritizedworkqueue.cpp
+14 -5
View File
@@ -48,8 +48,10 @@ PrioritizedWorkQueueItem *PrioritizedWorkQueue::Pop() {
mutex_.lock();
while (queue_.empty()) {
notEmpty_.wait(mutex_);
if (done_)
if (done_) {
mutex_.unlock();
return 0;
}
}
// Find the top priority item (lowest value).
@@ -61,10 +63,17 @@ PrioritizedWorkQueueItem *PrioritizedWorkQueue::Pop() {
best_prio = (*iter)->priority();
}
}
PrioritizedWorkQueueItem *poppedItem = *best;
queue_.erase(best);
mutex_.unlock();
return poppedItem;
if (best != queue_.end()) {
PrioritizedWorkQueueItem *poppedItem = *best;
queue_.erase(best);
mutex_.unlock();
return poppedItem;
} else {
// Not really sure how this can happen, but let's be safe.
mutex_.unlock();
return 0;
}
}
// TODO: This feels ugly. Revisit later.