Skip to content

fix: prevent stream detection from corrupting current_file index #2209

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 1 commit into from
Mar 18, 2026
+12 −0
Merged

fix: prevent stream detection from corrupting current_file index #2209

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
12 changes: 12 additions & 0 deletions src/lib_ccx/ccx_demuxer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,19 @@ static int ccx_demuxer_open(struct ccx_demuxer *ctx, const char *file)

if (ctx->auto_stream == CCX_SM_AUTODETECT)
{
// Temporarily disable binary_concat during stream detection.
// detect_stream_type reads up to 1MB (STARTBYTESLENGTH) via
// buffered_read_opt. For files smaller than 1MB, hitting EOF
// causes buffered_read_opt to call switch_to_next_file (when
// binary_concat is enabled), which increments current_file
// past the valid range and closes the file descriptor.
// This leaves current_file pointing beyond inputfile[], causing
// format-specific handlers (e.g. matroska_loop) to crash when
// they access inputfile[current_file].
int saved_binary_concat = ccx_options.binary_concat;
ccx_options.binary_concat = 0;
detect_stream_type(ctx);
ccx_options.binary_concat = saved_binary_concat;
switch (ctx->stream_mode)
{
case CCX_SM_ELEMENTARY_OR_NOT_FOUND:
Expand Down
Loading