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 MSVC cross-CRT invalid free on output_filename (#2147)

Browse Source
This commit is contained in:
Atul Chahar
2026-03-13 07:24:47 +05:30
committed by GitHub
parent ee57fb46f3
commit 58a8ded621
3 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/CHANGES.TXT
View File

@@ -2,6 +2,7 @@
-------------------
- Fix: Remove strdup() memory leaks in WebVTT styling encoder, fix invalid CSS rgba(0,256,0) green value, fix missing free(unescaped) on write-error path (#2154)
- Fix: Prevent crash in Rust timing module when logging out-of-range PTS/FTS timestamps from malformed streams.
- Fix: Resolve Windows MSVC debug build crash caused by cross-CRT invalid free on Rust-allocated output_filename (#2126)
0.96.6 (2026-02-19)
-------------------

13
src/lib_ccx/general_loop.c
View File

@@ -1102,19 +1102,20 @@ void segment_output_file(struct lib_ccx_ctx *ctx, struct lib_cc_decode *dec_ctx)
ctx->segment_counter++;
if (enc_ctx)
{
struct encoder_cfg local_cfg = ccx_options.enc_cfg;
// list_del(&enc_ctx->list);
// dinit_encoder(&enc_ctx, t);
const char *extension = get_file_extension(ccx_options.enc_cfg.write_format);
const char *extension = get_file_extension(local_cfg.write_format);
// Format: "%s_%06d%s" needs: basefilename + '_' + up to 10 digits + extension + null
size_t needed_len = strlen(ctx->basefilename) + 1 + 10 + strlen(extension) + 1;
freep(&ccx_options.enc_cfg.output_filename);
ccx_options.enc_cfg.output_filename = malloc(needed_len);
if (!ccx_options.enc_cfg.output_filename)
local_cfg.output_filename = malloc(needed_len);
if (!local_cfg.output_filename)
{
fatal(EXIT_NOT_ENOUGH_MEMORY, "In segment handling: Out of memory allocating output filename.");
}
snprintf(ccx_options.enc_cfg.output_filename, needed_len, "%s_%06d%s", ctx->basefilename, ctx->segment_counter + 1, extension);
reset_output_ctx(enc_ctx, &ccx_options.enc_cfg);
snprintf(local_cfg.output_filename, needed_len, "%s_%06d%s", ctx->basefilename, ctx->segment_counter + 1, extension);
reset_output_ctx(enc_ctx, &local_cfg);
freep(&local_cfg.output_filename);
}
}
}

32
src/lib_ccx/lib_ccx.c
View File

@@ -270,7 +270,8 @@ void dinit_libraries(struct lib_ccx_ctx **ctx)
freep(&lctx->freport.data_from_708);
ccx_demuxer_delete(&lctx->demux_ctx);
dinit_decoder_setting(&lctx->dec_global_setting);
freep(&ccx_options.enc_cfg.output_filename);
// Do not free ccx_options.enc_cfg.output_filename here because it is owned by Rust (allocated via CString::into_raw).
// Rust will clean it up if needed. Calling C's free() on it causes an assertion failure on Windows Debug CRTs.
freep(&lctx->basefilename);
freep(&lctx->pesheaderbuf);
if (lctx->inputfile)
@@ -433,17 +434,24 @@ struct encoder_ctx *update_encoder_list_cinfo(struct lib_ccx_ctx *ctx, struct ca
{
if (ctx->out_interval != -1)
{
struct encoder_cfg local_cfg = ccx_options.enc_cfg;
// Format: "%s_%06d%s" needs: basefilename + '_' + up to 10 digits + extension + null
size_t len = strlen(ctx->basefilename) + 1 + 10 + strlen(extension) + 1;
freep(&ccx_options.enc_cfg.output_filename);
ccx_options.enc_cfg.output_filename = malloc(len);
if (!ccx_options.enc_cfg.output_filename)
local_cfg.output_filename = malloc(len);
if (!local_cfg.output_filename)
{
return NULL;
}
snprintf(ccx_options.enc_cfg.output_filename, len, "%s_%06d%s", ctx->basefilename, ctx->segment_counter + 1, extension);
snprintf(local_cfg.output_filename, len, "%s_%06d%s", ctx->basefilename, ctx->segment_counter + 1, extension);
local_cfg.program_number = pn;
local_cfg.in_format = in_format;
enc_ctx = init_encoder(&local_cfg);
freep(&local_cfg.output_filename); // safely free the malloc'd string
if (!enc_ctx)
return NULL;
list_add_tail(&(enc_ctx->list), &(ctx->enc_ctx_head));
}
if (list_empty(&ctx->enc_ctx_head))
{
@@ -457,26 +465,26 @@ struct encoder_ctx *update_encoder_list_cinfo(struct lib_ccx_ctx *ctx, struct ca
}
else
{
struct encoder_cfg local_cfg = ccx_options.enc_cfg;
// Format: "%s_%d%s" needs: basefilename + '_' + up to 10 digits + extension + null
size_t len = strlen(ctx->basefilename) + 1 + 10 + strlen(extension) + 1;
ccx_options.enc_cfg.program_number = pn;
ccx_options.enc_cfg.output_filename = malloc(len);
if (!ccx_options.enc_cfg.output_filename)
local_cfg.program_number = pn;
local_cfg.output_filename = malloc(len);
if (!local_cfg.output_filename)
{
return NULL;
}
snprintf(ccx_options.enc_cfg.output_filename, len, "%s_%d%s", ctx->basefilename, pn, extension);
enc_ctx = init_encoder(&ccx_options.enc_cfg);
snprintf(local_cfg.output_filename, len, "%s_%d%s", ctx->basefilename, pn, extension);
enc_ctx = init_encoder(&local_cfg);
freep(&local_cfg.output_filename); // safely free the malloc'd string
if (!enc_ctx)
{
freep(&ccx_options.enc_cfg.output_filename);
return NULL;
}
list_add_tail(&(enc_ctx->list), &(ctx->enc_ctx_head));
freep(&ccx_options.enc_cfg.output_filename);
}
// DVB related
enc_ctx->prev = NULL;