rafaelcaricio/gstreamer-rs
1
0
Fork 0
forked from mirrors/gstreamer-rs
Code Pull requests Activity

basetransform: Don't leak any output buffer if prepare_output_buffer fails

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1285>
This commit is contained in:
Sebastian Dröge 2023-06-30 10:33:30 +03:00
parent eff6b4c952
commit 96c7eb9563
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gstreamer-base/src/subclass/base_transform.rs
View file

@ -570,6 +570,13 @@ impl<T: BaseTransformImpl> BaseTransformImplExt for T {
PrepareOutputBufferSuccess::Buffer(from_glib_full(outbuf)) PrepareOutputBufferSuccess::Buffer(from_glib_full(outbuf))
} }
}) })
.map_err(|err| {
if outbuf != buf as *mut _ {
drop(Option::<gst::Buffer>::from_glib_full(outbuf));
}
err
})
}) })
.unwrap_or(Err(gst::FlowError::NotSupported)) .unwrap_or(Err(gst::FlowError::NotSupported))
} }
@ -1140,6 +1147,8 @@ unsafe extern "C" fn base_transform_prepare_output_buffer<T: BaseTransformImpl>(
true => InputBuffer::Writable(gst::BufferRef::from_mut_ptr(inbuf)), true => InputBuffer::Writable(gst::BufferRef::from_mut_ptr(inbuf)),
}; };
*outbuf = ptr::null_mut();
gst::panic_to_error!(imp, gst::FlowReturn::Error, { gst::panic_to_error!(imp, gst::FlowReturn::Error, {
match imp.prepare_output_buffer(buffer) { match imp.prepare_output_buffer(buffer) {
Ok(PrepareOutputBufferSuccess::InputBuffer) => { Ok(PrepareOutputBufferSuccess::InputBuffer) => {