[FIX] NUL-terminate mode/info strings in add_cc_sub_text - #2331
Merged
cfsmp3 merged 3 commits intoSep 5, 2026
Merged
Conversation
strncpy of length 4 left 4-character strings such as ISDB and BURN without a terminator. Co-authored-by: Cursor <cursoragent@cursor.com>
The format_rust CI job treats clippy warnings as errors. Initialize c_len in one expression so the check passes. Co-authored-by: Cursor <cursoragent@cursor.com>
Contributor
Author
|
Greetings maintainers |
Collaborator
CCExtractor CI platform finished running the test files on windows. 167/237 tests matched the approved output:
70 tests do not match the approved output. That is the pass/fail verdict. Whether this branch caused it is a separate question, answered below.
Compared with the tip of master — test 9495, commit 3af3fc2:
Pass there, fail here:
Compared with the commit this branch was cut from: the same run as the tip of master (test 9495), so the comparison above already covers it. This branch changes the behaviour of 1 test(s) relative to the tip of master. Those are the ones worth looking at; anything else in the list fails the same way on both sides. |
cfsmp3
self-requested a review
September 5, 2026 19:16
cfsmp3
requested changes
Sep 5, 2026
cfsmp3
left a comment
cfsmp3
left a comment
Contributor
There was a problem hiding this comment.
@NaitikVerma6776 The C bit looks good, but the Rust part is unrelated. Can just remove it and leave the C issue fix only?
This reverts commit fc7ab97.
Contributor
Author
|
hey @cfsmp3 .... removed the Rust/clippy change. The PR is only the C fix in |
Collaborator
CCExtractor CI platform finished running the test files on linux. 167/237 tests matched the approved output:
70 tests do not match the approved output. That is the pass/fail verdict. Whether this branch caused it is a separate question, answered below.
Compared with the tip of master — test 9499, commit 3af3fc2:
Compared with the commit this branch was cut from: the same run as the tip of master (test 9499), so the comparison above already covers it. No test changes behaviour relative to the tip of master: every failure above fails there too, byte for byte. The approved output for those tests is out of date, which is a baseline to review rather than a regression in this branch. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Fixes #2330
In raising this pull request, I confirm the following (please check boxes):
Reason for this PR:
Sanity check:
Repro instructions:
This is a C string bug in
add_cc_sub_text(), not a single-file caption extraction failure. No video sample is attached because the defect is in howmode/infoare copied.struct cc_subtitlehaschar mode[5]andchar info[4]."ISDB"(ccx_decoders_isdb.c) and"BURN"(hardsubx_decoder.c).strncpy(..., 4). When the source is exactly 4 characters,strncpydoes not write'\0'.strcmp(sub->mode, "TLT")and"%s"onsub->mode(ccx_encoders_transcript.c), which requires a terminator."TLT"(3 characters) was already terminated bystrncpy. The first subtitle can also look fine if the struct wascalloc'd (the extra byte is already 0). Later nodes usemallocand can leavemode[4]as garbage.How to confirm from source: search for
add_cc_sub_text(..., "ISDB"/"BURN"and the oldstrncpy(..., 4)on master vs this branch.Summary
add_cc_sub_text()now copiesinfoandmodewithsizeof(field) - 1and always writes a terminating'\0'.That keeps 4-character labels such as
ISDBandBURNvalid C strings, so laterstrcmp/"%s"in transcript output cannot read past the array.No changelog update: this is a bug fix only. No new feature code.