syncpoint_manager: ensure handle is removable before removing
This commit is contained in:
parent
c3cae9d992
commit
b1cd6cec19
|
@ -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) {
|
||||||
|
|
Loading…
Reference in New Issue