MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

af_compand: make sure request_frame always outputs at least one frame

Browse Source 
This fixes a segmentation fault because request_frame in fifo.c assumes
that the call to ff_request_frame will populate fifo->root.next.
Before, it was possible for request_frame in af_compand to not do this,
resulting in a null pointer access. Now, request_frame in af_compand
always will return at least one frame or an error, as per the API
specifications in avfilter.h for request_frame.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Andrew Kelley 2014-07-05 22:24:43 -07:00 committed by Anton Khirnov
parent a9aee08d90
commit d3cfd7aff8
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavfilter/af_compand.c
View File

@ -71,6 +71,8 @@ typedef struct CompandContext {
int64_t pts;
int (*compand)(AVFilterContext *ctx, AVFrame *frame);
/* set by filter_frame() to signal an output frame to request_frame() */
int got_output;
} CompandContext;
#define OFFSET(x) offsetof(CompandContext, x)
@ -287,7 +289,15 @@ static int compand_delay(AVFilterContext *ctx, AVFrame *frame)
s->delay_index = dindex;
av_frame_free(&frame);
return out_frame ? ff_filter_frame(ctx->outputs[0], out_frame) : 0;
if (out_frame) {
err = ff_filter_frame(ctx->outputs[0], out_frame);
if (err >= 0)
s->got_output = 1;
return err;
}
return 0;
}
static int compand_drain(AVFilterLink *outlink)
@ -559,9 +569,11 @@ static int request_frame(AVFilterLink *outlink)
{
AVFilterContext *ctx = outlink->src;
CompandContext *s = ctx->priv;
int ret;
int ret = 0;
ret = ff_request_frame(ctx->inputs[0]);
s->got_output = 0;
while (ret >= 0 && !s->got_output)
ret = ff_request_frame(ctx->inputs[0]);
if (ret == AVERROR_EOF && s->delay_count)
ret = compand_drain(outlink);