encounter/rust-sdl2
0
0
Fork 0
mirror of https://github.com/encounter/rust-sdl2.git synced 2026-07-10 21:18:41 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1012 from GautierMinster/audio/audio_device_name_open_use_after_free

Browse Source 
audio: fix device name use-after-free in AudioDevice::open
This commit is contained in:
Cobrand
2020-06-24 14:18:58 +02:00
committed by GitHub
parent 92fb34da8f 482a039f92
commit 99afa37e67
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sdl2/audio.rs
+8 -2
View File
@@ -559,7 +559,10 @@ impl<'a, Channel: AudioFormatNum> AudioQueue<Channel> {
Some(device) => Some(CString::new(device).unwrap()),
None => None
};
let device_ptr = device.map_or(ptr::null(), |s| s.as_ptr());
// Warning: map_or consumes its argument; `device.map_or()` would therefore consume the
// CString and drop it, making device_ptr a dangling pointer! To avoid that we downgrade
// device to an Option<&_> first.
let device_ptr = device.as_ref().map_or(ptr::null(), |s| s.as_ptr());
let iscapture_flag = 0;
let device_id = sys::SDL_OpenAudioDevice(
@@ -652,7 +655,10 @@ impl<CB: AudioCallback> AudioDevice<CB> {
Some(device) => Some(CString::new(device).unwrap()),
None => None
};
let device_ptr = device.map_or(ptr::null(), |s| s.as_ptr());
// Warning: map_or consumes its argument; `device.map_or()` would therefore consume the
// CString and drop it, making device_ptr a dangling pointer! To avoid that we downgrade
// device to an Option<&_> first.
let device_ptr = device.as_ref().map_or(ptr::null(), |s| s.as_ptr());
let iscapture_flag = if capture { 1 } else { 0 };
let device_id = sys::SDL_OpenAudioDevice(