fix prevent FFI memory leaks in demuxer sync #1999
Merged
+59
−43
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In raising this pull request, I confirm the following (please check boxes):
My familiarity with the project is as follows (check one):
Summary
fixes multiple memory leaks and unsafe pointer overwrites in the Rust–C FFI demuxer synchronization logic.
The issues occur when Rust demuxer state is copied into C structures repeatedly (e.g. during resets), causing existing C-owned pointers to be overwritten without being freed.
Problem
In
copy_demuxer_from_rust_to_c, existing pointers inPID_buffersandPIDs_programswere overwritten without freeing the previous allocations, leading to cumulative memory leaks during demuxing.PSIBuffer::default()initializedbufferwith a dummy heap allocation instead ofNULL, which:Both issues become more visible when the demuxer is reset or reused multiple times.
Fixes
demuxer.rs
Box::from_rawto avoid undefined behaviorcommon_types.rs
PSIBuffer::bufferwithstd::ptr::null_mut()instead of a 1-byte allocationImpact
Verification
cargo testpasses insrc/rust