RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-13 10:44:59 +00:00
Code Issues Projects Releases Wiki Activity

graphparser: fix logic for updating the open_inputs/outputs in avfilter_graph_parse()

Browse Source 
Create open_inputs and open_outputs structs if they are not provided by
the user, and free them before exit.

In particular, fix NULL pointer dereference and crash, in case the
passed open_inputs/outputs is NULL and the parsing failed.
This commit is contained in:
Stefano Sabatini 2011-07-01 16:31:16 +02:00
parent c3b6cc61e5
commit df8c675f48
1 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
libavfilter/graphparser.c
View File

@ -333,38 +333,40 @@ static int parse_outputs(const char **buf, AVFilterInOut **curr_inputs,
} }
int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
AVFilterInOut **open_inputs, AVFilterInOut **open_outputs, AVFilterInOut **open_inputs_ptr, AVFilterInOut **open_outputs_ptr,
void *log_ctx) void *log_ctx)
{ {
int index = 0, ret; int index = 0, ret = 0;
char chr = 0; char chr = 0;
AVFilterInOut *curr_inputs = NULL; AVFilterInOut *curr_inputs = NULL;
AVFilterInOut *open_inputs = open_inputs_ptr ? *open_inputs_ptr : NULL;
AVFilterInOut *open_outputs = open_outputs_ptr ? *open_outputs_ptr : NULL;
do { do {
AVFilterContext *filter; AVFilterContext *filter;
const char *filterchain = filters; const char *filterchain = filters;
filters += strspn(filters, WHITESPACES); filters += strspn(filters, WHITESPACES);
if ((ret = parse_inputs(&filters, &curr_inputs, open_outputs, log_ctx)) < 0) if ((ret = parse_inputs(&filters, &curr_inputs, &open_outputs, log_ctx)) < 0)
goto fail; goto end;
if ((ret = parse_filter(&filter, &filters, graph, index, log_ctx)) < 0) if ((ret = parse_filter(&filter, &filters, graph, index, log_ctx)) < 0)
goto fail; goto end;
if (filter->input_count == 1 && !curr_inputs && !index) { if (filter->input_count == 1 && !curr_inputs && !index) {
/* First input can be omitted if it is "[in]" */ /* First input can be omitted if it is "[in]" */
const char *tmp = "[in]"; const char *tmp = "[in]";
if ((ret = parse_inputs(&tmp, &curr_inputs, open_outputs, log_ctx)) < 0) if ((ret = parse_inputs(&tmp, &curr_inputs, &open_outputs, log_ctx)) < 0)
goto fail; goto end;
} }
if ((ret = link_filter_inouts(filter, &curr_inputs, open_inputs, log_ctx)) < 0) if ((ret = link_filter_inouts(filter, &curr_inputs, &open_inputs, log_ctx)) < 0)
goto fail; goto end;
if ((ret = parse_outputs(&filters, &curr_inputs, open_inputs, open_outputs, if ((ret = parse_outputs(&filters, &curr_inputs, &open_inputs, &open_outputs,
log_ctx)) < 0) log_ctx)) < 0)
goto fail; goto end;
filters += strspn(filters, WHITESPACES); filters += strspn(filters, WHITESPACES);
chr = *filters++; chr = *filters++;
@ -374,7 +376,7 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
"Invalid filterchain containing an unlabelled output pad: \"%s\"\n", "Invalid filterchain containing an unlabelled output pad: \"%s\"\n",
filterchain); filterchain);
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto end;
} }
index++; index++;
} while (chr == ',' || chr == ';'); } while (chr == ',' || chr == ';');
@ -384,25 +386,29 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
"Unable to parse graph description substring: \"%s\"\n", "Unable to parse graph description substring: \"%s\"\n",
filters - 1); filters - 1);
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto end;
} }
if (open_inputs && *open_inputs && !strcmp((*open_inputs)->name, "out") && curr_inputs) { if (open_inputs && !strcmp(open_inputs->name, "out") && curr_inputs) {
/* Last output can be omitted if it is "[out]" */ /* Last output can be omitted if it is "[out]" */
const char *tmp = "[out]"; const char *tmp = "[out]";
if ((ret = parse_outputs(&tmp, &curr_inputs, open_inputs, open_outputs, if ((ret = parse_outputs(&tmp, &curr_inputs, &open_inputs, &open_outputs,
log_ctx)) < 0) log_ctx)) < 0)
goto fail; goto end;
} }
return 0; end:
/* clear open_in/outputs only if not passed as parameters */
fail: if (open_inputs_ptr) *open_inputs_ptr = open_inputs;
for (; graph->filter_count > 0; graph->filter_count--) else avfilter_inout_free(&open_inputs);
avfilter_free(graph->filters[graph->filter_count - 1]); if (open_outputs_ptr) *open_outputs_ptr = open_outputs;
av_freep(&graph->filters); else avfilter_inout_free(&open_outputs);
avfilter_inout_free(open_inputs);
avfilter_inout_free(open_outputs);
avfilter_inout_free(&curr_inputs); avfilter_inout_free(&curr_inputs);
if (ret < 0) {
for (; graph->filter_count > 0; graph->filter_count--)
avfilter_free(graph->filters[graph->filter_count - 1]);
av_freep(&graph->filters);
}
return ret; return ret;
} }