Skip to content

Fix/dtvcc allocation panic #2050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pranavshar223 wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −3
Open

Fix/dtvcc allocation panic #2050

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/rust/src/decoder/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,12 @@ impl DtvccRust {
let tv_layout = std::alloc::Layout::new::<dtvcc_tv_screen>();
let tv_ptr = unsafe { std::alloc::alloc_zeroed(tv_layout) } as *mut dtvcc_tv_screen;
if tv_ptr.is_null() {
panic!("Failed to allocate dtvcc_tv_screen");
debug!(
msg_type = DebugMessageFlag::DECODER_708;
"DTVCC: Failed to allocate tv_screen for service {}, disabling service",
i + 1
);
continue;
}
let mut tv_screen = unsafe { Box::from_raw(tv_ptr) };
tv_screen.cc_count = 0;
Expand All @@ -299,9 +304,14 @@ impl DtvccRust {
let decoder_ptr = unsafe { std::alloc::alloc_zeroed(decoder_layout) }
as *mut dtvcc_service_decoder;
if decoder_ptr.is_null() {
panic!("Failed to allocate dtvcc_service_decoder");
}
debug!(
msg_type = DebugMessageFlag::DECODER_708;
"DTVCC: Failed to allocate service decoder {}, disabling service",
i + 1
);

continue;
}
let mut decoder = unsafe { Box::from_raw(decoder_ptr) };

// Set the tv pointer
Expand Down
Loading