Skip to content

fix: resolve dangling pointer in switch_output_file #2286

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

Open
TacoJr01 wants to merge 1 commit into
base: master
Choose a base branch
from
+27 −15
Open

fix: resolve dangling pointer in switch_output_file #2286

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
42 changes: 27 additions & 15 deletions src/lib_ccx/ccx_encoders_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1352,35 +1352,47 @@ unsigned int get_font_encoded(struct encoder_ctx *ctx, unsigned char *buffer, in

void switch_output_file(struct lib_ccx_ctx *ctx, struct encoder_ctx *enc_ctx, int track_id)
{
// Do nothing when in "report" mode
if (enc_ctx == NULL || enc_ctx->out == NULL)
{
return;
}

if (enc_ctx->out->filename != NULL)
{ // Close and release the previous handle
free(enc_ctx->out->filename);
close(enc_ctx->out->fh);
}
const char *ext = get_file_extension(ctx->write_format);

char suffix[32];

snprintf(suffix, sizeof(suffix), "_%d", track_id);
// Prepare new values BEFORE freeing old ones
char *basename = get_basename(enc_ctx->out->original_filename);
if (basename != NULL)

if (basename == NULL)
return;
char *new_filename = create_outfilename(basename, suffix, ext);

free(basename);

if (new_filename == NULL)
return;
int new_fh = open(new_filename, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, S_IREAD | S_IWRITE);

if (new_fh == -1)
{
enc_ctx->out->filename = create_outfilename(basename, suffix, ext);
enc_ctx->out->fh = open(enc_ctx->out->filename, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, S_IREAD | S_IWRITE);
free(basename);
free(new_filename);
return;
}
// Only now is it safe to free and replace the old values
if (enc_ctx->out->filename != NULL)
{
free(enc_ctx->out->filename);
enc_ctx->out->filename = NULL;
close(enc_ctx->out->fh);
enc_ctx->out->fh = -1;
}

enc_ctx->out->filename = new_filename;
enc_ctx->out->fh = new_fh;
write_subtitle_file_header(enc_ctx, enc_ctx->out);

// Reset counters as we switch output file.
enc_ctx->cea_708_counter = 0;
enc_ctx->srt_counter = 0;
}

/**
* Get or create the output file for a specific teletext page (issue #665)
* Creates output files on-demand with suffix _pNNN (e.g., output_p891.srt)
Expand Down
Loading