fix: prevent stream detection from corrupting current_file index#2209
Merged
fix: prevent stream detection from corrupting current_file index#2209
Conversation
detect_stream_type() reads up to 1MB (STARTBYTESLENGTH) via buffered_read_opt() for format detection. For input files smaller than 1MB, the read hits EOF and—because binary_concat defaults to enabled—buffered_read_opt() calls switch_to_next_file(). This increments current_file past the valid range and closes the file descriptor, leaving format-specific handlers (matroska_loop, MP4, etc.) to crash when they access inputfile[current_file]. Fix: temporarily disable binary_concat around detect_stream_type() so that hitting EOF during detection never triggers file switching. Fixes the root cause of the crash reported in PR #2206 (which proposed a band-aid of using current_file-1). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Collaborator
CCExtractor CI platform finished running the test files on linux. Below is a summary of the test results, when compared to test for commit 92389cf...:
Your PR breaks these cases:
NOTE: The following tests have been failing on the master branch as well as the PR:
Congratulations: Merging this PR would fix the following tests:
It seems that not all tests were passed completely. This is an indication that the output of some files is not as expected (but might be according to you). Check the result page for more info. |
Collaborator
CCExtractor CI platform finished running the test files on windows. Below is a summary of the test results, when compared to test for commit 52b5385...:
Your PR breaks these cases:
NOTE: The following tests have been failing on the master branch as well as the PR:
Congratulations: Merging this PR would fix the following tests:
It seems that not all tests were passed completely. This is an indication that the output of some files is not as expected (but might be according to you). Check the result page for more info. |
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
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.
Summary
detect_stream_type()reads 1 MB viabuffered_read_opt()for format detection. For files smaller than 1 MB, hitting EOF triggersswitch_to_next_file()(becausebinary_concatdefaults to enabled), which incrementscurrent_filepast the valid range and closes the file descriptormatroska_loop,processmp4, etc.) then crash accessinginputfile[current_file]binary_concatarounddetect_stream_type()so EOF during detection never triggers file switchingAffected code path
ccx_demuxer_open()→detect_stream_type()→buffered_read_opt()→ EOF →switch_to_next_file()→current_file++beyond valid rangeReproduction
Any MKV (or other format) file under 1 MB:
Test plan
🤖 Generated with Claude Code