Kieran/ffmpeg-the-third
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

format: fix segmentation fault

Browse Source 
Double free error.

On failure avformat_open_input frees AVFormatContext. I had it wrapped with context::Input::wrap. On avformat_open_input failure it would free AVFormatContext and Drop implementation for context::Input would try to call avformat_close_input on same AVFormatContext resulting in segmentation fault.
This commit is contained in:
Tadas Barzdžius 2017-08-21 20:38:36 +03:00 committed by meh
parent 5afe774f40
commit 052d342baf
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/format/mod.rs
View File

@ -181,14 +181,14 @@ pub fn input_with_dictionary<P: AsRef<Path>>(path: &P, options: Dictionary) -> R
pub fn input_with_interrupt<P: AsRef<Path>, F>(path: &P, closure: F) -> Result<context::Input, Error> pub fn input_with_interrupt<P: AsRef<Path>, F>(path: &P, closure: F) -> Result<context::Input, Error>
where F: FnMut() -> bool { where F: FnMut() -> bool {
unsafe { unsafe {
let mut ps = context::Input::wrap(avformat_alloc_context()); let mut ps = avformat_alloc_context();
let path = from_path(path); let path = from_path(path);
(*ps.as_mut_ptr()).interrupt_callback = interrupt::new(Box::new(closure)).interrupt; (*ps).interrupt_callback = interrupt::new(Box::new(closure)).interrupt;
match avformat_open_input(&mut ps.as_mut_ptr(), path.as_ptr(), ptr::null_mut(), ptr::null_mut()) { match avformat_open_input(&mut ps, path.as_ptr(), ptr::null_mut(), ptr::null_mut()) {
0 => { 0 => {
match avformat_find_stream_info(ps.as_mut_ptr(), ptr::null_mut()) { match avformat_find_stream_info(ps, ptr::null_mut()) {
r if r >= 0 => Ok(ps), r if r >= 0 => Ok(context::Input::wrap(ps)),
e => Err(Error::from(e)), e => Err(Error::from(e)),
} }
} }