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

style: add missing braces to strdup NULL checks (#2213 follow-up) (#2237)

Browse Source
This commit is contained in:
Carlos Fernandez Sanz
2026-03-28 12:08:31 -07:00
committed by GitHub
parent 8e4bcfc0cb
commit c4573bdced
8 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib_ccx/ccx_common_common.c
View File

@@ -60,8 +60,10 @@ int add_cc_sub_text(struct cc_subtitle *sub, char *str, LLONG start_time,
sub->enc_type = e_type;
sub->data = strdup(str);
if (sub->data == NULL)
{
ccx_common_logging.fatal_ftn(EXIT_NOT_ENOUGH_MEMORY,
"In add_cc_sub_text: Not enough memory for subtitle data.\n");
}
sub->datatype = CC_DATATYPE_GENERIC;
sub->nb_data = str ? strlen(str) : 0;
sub->start_time = start_time;

4
src/lib_ccx/ccx_encoders_common.c
View File

@@ -609,8 +609,10 @@ static int init_output_ctx(struct encoder_ctx *ctx, struct encoder_cfg *cfg)
char *fname0 = strdup(cfg->output_filename);
if (fname0 == NULL)
{
fatal(EXIT_NOT_ENOUGH_MEMORY,
"In init_output_ctx: Not enough memory for output filename.\n");
}
ret = init_write(&ctx->out[0], fname0, cfg->with_semaphore);
check_ret(cfg->output_filename);
ret = init_write(&ctx->out[1], create_outfilename(basefilename, "_2", extension), cfg->with_semaphore);
@@ -621,8 +623,10 @@ static int init_output_ctx(struct encoder_ctx *ctx, struct encoder_cfg *cfg)
{
char *fname = strdup(cfg->output_filename);
if (fname == NULL)
{
fatal(EXIT_NOT_ENOUGH_MEMORY,
"In init_output_ctx: Not enough memory for output filename.\n");
}
ret = init_write(ctx->out, fname, cfg->with_semaphore);
check_ret(cfg->output_filename);
}

4
src/lib_ccx/ccx_encoders_helpers.c
View File

@@ -99,8 +99,10 @@ void call_function_if_match(unsigned char *line, struct word_list *list, void (*
unsigned char *line_token = strdup(line);
if (line_token == NULL)
{
ccx_common_logging.fatal_ftn(EXIT_NOT_ENOUGH_MEMORY,
"In call_function_if_match: Not enough memory for line copy.\n");
}
unsigned char *c = strtok(line_token, delim);
if (c != NULL)
@@ -131,8 +133,10 @@ void telx_correct_case(char *sub_line)
char *line = strdup(((char *)sub_line));
if (line == NULL)
{
ccx_common_logging.fatal_ftn(EXIT_NOT_ENOUGH_MEMORY,
"In telx_correct_case: Not enough memory for line copy.\n");
}
char *oline = (char *)sub_line;
char *c = strtok(line, delim);
if (c == NULL)

2
src/lib_ccx/configuration.c
View File

@@ -20,8 +20,10 @@ static int set_string(void *var, char *val)
val1 = strdup(val);
if (val1 == NULL)
{
fatal(EXIT_NOT_ENOUGH_MEMORY,
"In set_string: Not enough memory for string copy.\n");
}
*p = val1;
return 0;
}

2
src/lib_ccx/hardsubx.c
View File

@@ -234,8 +234,10 @@ struct lib_hardsubx_ctx *_init_hardsubx(struct ccx_s_options *options)
ctx->tess_handle = TessBaseAPICreate();
char *pars_vec = strdup("debug_file");
if (pars_vec == NULL)
{
fatal(EXIT_NOT_ENOUGH_MEMORY,
"In _init_hardsubx: Not enough memory for pars_vec.\n");
}
char *pars_values = strdup("/dev/null");
if (pars_values == NULL)
{

8
src/lib_ccx/hardsubx_decoder.c
View File

@@ -228,8 +228,10 @@ void hardsubx_process_frames_linear(struct lib_hardsubx_ctx *ctx, struct encoder
{
prev_subtitle_text = strdup(subtitle_text);
if (prev_subtitle_text == NULL)
{
fatal(EXIT_NOT_ENOUGH_MEMORY,
"In hardsubx_process_frames_linear: Not enough memory for subtitle text.\n");
}
prev_sub_encoded = 0;
}
}
@@ -255,8 +257,10 @@ void hardsubx_process_frames_linear(struct lib_hardsubx_ctx *ctx, struct encoder
prev_end_time = convert_pts_to_ms(ctx->packet.pts, ctx->format_ctx->streams[ctx->video_stream_id]->time_base);
prev_subtitle_text = strdup(subtitle_text);
if (prev_subtitle_text == NULL)
{
fatal(EXIT_NOT_ENOUGH_MEMORY,
"In hardsubx_process_frames_linear: Not enough memory for subtitle text.\n");
}
prev_sub_encoded = 0;
}
prev_packet_pts = ctx->packet.pts;
@@ -521,8 +525,10 @@ void process_hardsubx_linear_frames_and_normal_subs(struct lib_hardsubx_ctx *har
{
prev_subtitle_text_hard = strdup(subtitle_text_hard);
if (prev_subtitle_text_hard == NULL)
{
fatal(EXIT_NOT_ENOUGH_MEMORY,
"In process_hardsubx_linear_frames_and_normal_subs: Not enough memory for subtitle text.\n");
}
prev_sub_encoded_hard = 0;
}
}
@@ -535,8 +541,10 @@ void process_hardsubx_linear_frames_and_normal_subs(struct lib_hardsubx_ctx *har
prev_end_time_hard = convert_pts_to_ms(hard_ctx->packet.pts, hard_ctx->format_ctx->streams[hard_ctx->video_stream_id]->time_base);
prev_subtitle_text_hard = strdup(subtitle_text_hard);
if (prev_subtitle_text_hard == NULL)
{
fatal(EXIT_NOT_ENOUGH_MEMORY,
"In process_hardsubx_linear_frames_and_normal_subs: Not enough memory for subtitle text.\n");
}
prev_sub_encoded_hard = 0;
}
prev_packet_pts_hard = hard_ctx->packet.pts;

2
src/lib_ccx/ocr.c
View File

@@ -520,8 +520,10 @@ static char *ocr_single_line(struct ocrCtx *ctx, PIX *line_pix)
text = strdup(tess_text);
TessDeleteText(tess_text);
if (text == NULL)
{
fatal(EXIT_NOT_ENOUGH_MEMORY,
"In ocr_single_line: Not enough memory for OCR text.\n");
}
}
}

2
src/lib_ccx/output.c
View File

@@ -71,8 +71,10 @@ int init_write(struct ccx_s_write *wb, char *filename, int with_semaphore)
wb->filename = filename;
wb->original_filename = strdup(filename);
if (wb->original_filename == NULL)
{
fatal(EXIT_NOT_ENOUGH_MEMORY,
"In init_write: Not enough memory for original filename.\n");
}
wb->with_semaphore = with_semaphore;
wb->append_mode = ccx_options.enc_cfg.append_mode;