Skip to content

[FIX] rust: add defensive length check to validate_cc_pair #2015

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

Merged
cfsmp3 merged 4 commits into from
Jan 18, 2026
Merged

[FIX] rust: add defensive length check to validate_cc_pair #2015

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eea0499
add defensive length check to validate_cc_pair
Harsh-Sahu43 Jan 10, 2026
7e32d6a
Merge branch 'CCExtractor:master' into tests/validate-cc-pair
Harsh-Sahu43 Jan 10, 2026
1447b02
Fixed : formatting
Harsh-Sahu43 Jan 18, 2026
2d9b480
Merge branch 'CCExtractor:master' into tests/validate-cc-pair
Harsh-Sahu43 Jan 18, 2026
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
13 changes: 13 additions & 0 deletions src/rust/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,10 @@ extern "C" fn ccxr_process_cc_data(
const CC_SOLID_BLANK: u8 = 0x7F;

pub fn validate_cc_pair(cc_block: &mut [u8]) -> bool {
if cc_block.len() != 3 {
return false;
}

let cc_valid = (cc_block[0] & 4) >> 2;
let cc_type = cc_block[0] & 3;
if cc_valid == 0 {
Expand Down Expand Up @@ -805,6 +809,15 @@ mod test {
assert!(!validate_cc_pair(&mut cc_block));
}

#[test]
fn test_validate_cc_pair_invalid_length() {
let mut short = [0x97, 0x1F];
assert!(!validate_cc_pair(&mut short));

let mut long = [0x97, 0x1F, 0x3C, 0x00];
assert!(!validate_cc_pair(&mut long));
}

#[test]
fn test_do_cb() {
let mut dtvcc_ctx = crate::decoder::test::initialize_dtvcc_ctx();
Expand Down
Loading