starred/ccextractor
1
0
Fork 0
mirror of https://github.com/CCExtractor/ccextractor.git synced 2026-07-08 18:06:30 +00:00
Code Issues 1.5k Packages Projects Releases 21 Wiki Activity

fix: prevent stream detection from corrupting current_file index (#2209)

Browse Source 
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>
This commit is contained in:
Carlos Fernandez Sanz
2026-03-17 20:12:20 -07:00
committed by GitHub
parent 52b5385c2a
commit 0b1a967b73
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib_ccx/ccx_demuxer.c
View File

@@ -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: