yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Merge pull request #9049 from liamwhite/monkeyhawk 

syncpoint_manager: ensure handle is removable before removing
This commit is contained in:
bunnei 2022-10-12 12:34:22 -07:00 committed by GitHub
parent 133a68ee9b b1cd6cec19
commit 77177a7e33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/video_core/host1x/syncpoint_manager.cpp
View File

@ -36,7 +36,17 @@ SyncpointManager::ActionHandle SyncpointManager::RegisterAction(
void SyncpointManager::DeregisterAction(std::list<RegisteredAction>& action_storage, void SyncpointManager::DeregisterAction(std::list<RegisteredAction>& action_storage,
ActionHandle& handle) { ActionHandle& handle) {
std::unique_lock lk(guard); std::unique_lock lk(guard);
action_storage.erase(handle);
// We want to ensure the iterator still exists prior to erasing it
// Otherwise, if an invalid iterator was passed in then it could lead to UB
// It is important to avoid UB in that case since the deregister isn't called from a locked
// context
for (auto it = action_storage.begin(); it != action_storage.end(); it++) {
if (it == handle) {
action_storage.erase(it);
return;
}
}
} }
void SyncpointManager::DeregisterGuestAction(u32 syncpoint_id, ActionHandle& handle) { void SyncpointManager::DeregisterGuestAction(u32 syncpoint_id, ActionHandle& handle) {