mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-10-22 20:36:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

win_audio: duplicate the 2 ready Events

Browse source 
When DeviceRenderer is destroyed, ready_event and async_ready_event will
be both dropped, and CloseHandle will be called on the same HANDLE
twice.

Duplicate the event HANDLE before passing to the ex.async_event event
factory.

TEST=flat run battlestar; run a game and close a game in debug mode, no exception is caught
BUG=b:370552944
Change-Id: I3d7536e450af52e38e37556adcb16d42c73ef23f
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5900813
Reviewed-by: Richard Zhang <rizhang@google.com>
Commit-Queue: Kaiyi Li <kaiyili@google.com>
This commit is contained in:
Kaiyi Li 2024-09-30 12:44:59 -07:00 committed by crosvm LUCI
parent 3fd465afdf
commit 3debe19097
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
win_audio/src/win_audio_impl/mod.rs
View file

@ -47,6 +47,7 @@ use base::Error;
use base::Event;
use base::EventExt;
use base::EventWaitResult;
use base::IntoRawDescriptor;
use completion_handler::WinAudioActivateAudioInterfaceCompletionHandler;
use sync::Mutex;
use thiserror::Error as ThisError;
@ -1671,13 +1672,10 @@ fn create_and_set_audio_client_event(
)?;
let async_ready_event = if let Some(ex) = ex {
// SAFETY:
// Unsafe if `ready_event` and `async_ready_event` have different
// lifetimes because both can close the underlying `RawDescriptor`. However, both
// will be stored in the `DeviceRenderer` or `DeviceCapturer` fields, so this should be
// safe.
let ready_event = ready_event.try_clone().map_err(WinAudioError::CloneEvent)?;
// SAFETY: ready_event is cloned from an Event. Its RawDescriptor must be also an Event.
Some(unsafe {
ex.async_event(ready_event.as_raw_descriptor())
ex.async_event(ready_event.into_raw_descriptor())
.map_err(|e| {
WinAudioError::AsyncError(e, "Failed to create async event".to_string())
})?