RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_xfade: Check ff_inlink_consume_frame() for failure 

Fixes: CID1458043 Unchecked return value

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 73ca4e75eb)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2024-07-12 00:28:14 +02:00
parent dc2b488fc7
commit 224dd41cce
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavfilter/vf_xfade.c
View File

@ -2288,8 +2288,11 @@ static int xfade_activate(AVFilterContext *avctx)
// Check if we are not yet transitioning, in which case // Check if we are not yet transitioning, in which case
// just request and forward the input frame. // just request and forward the input frame.
if (s->start_pts > s->pts) { if (s->start_pts > s->pts) {
int ret;
s->passthrough = 1; s->passthrough = 1;
ff_inlink_consume_frame(in_a, &s->xf[0]); ret = ff_inlink_consume_frame(in_a, &s->xf[0]);
if (ret < 0)
return ret;
return ff_filter_frame(outlink, s->xf[0]); return ff_filter_frame(outlink, s->xf[0]);
} }
s->passthrough = 0; s->passthrough = 0;
@ -2297,8 +2300,14 @@ static int xfade_activate(AVFilterContext *avctx)
// We are transitioning, so we need a frame from second input // We are transitioning, so we need a frame from second input
if (ff_inlink_check_available_frame(in_b)) { if (ff_inlink_check_available_frame(in_b)) {
int ret; int ret;
ff_inlink_consume_frame(avctx->inputs[0], &s->xf[0]); ret = ff_inlink_consume_frame(avctx->inputs[0], &s->xf[0]);
ff_inlink_consume_frame(avctx->inputs[1], &s->xf[1]); if (ret < 0)
return ret;
ret = ff_inlink_consume_frame(avctx->inputs[1], &s->xf[1]);
if (ret < 0) {
av_frame_free(&s->xf[0]);
return ret;
}
// Calculate PTS offset to first input // Calculate PTS offset to first input
if (s->inputs_offset_pts == AV_NOPTS_VALUE) if (s->inputs_offset_pts == AV_NOPTS_VALUE)