Fixes: CID1458043 Unchecked return value
Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
libavfilter/vf_xfade.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/libavfilter/vf_xfade.c b/libavfilter/vf_xfade.c
index e67a917d14f..e97117704a0 100644
--- a/libavfilter/vf_xfade.c
+++ b/libavfilter/vf_xfade.c
@@ -2288,8 +2288,11 @@ static int xfade_activate(AVFilterContext *avctx)
// Check if we are not yet transitioning, in which case
// just request and forward the input frame.
if (s->start_pts > s->pts) {
+ int ret;
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]);
}
s->passthrough = 0;
@@ -2297,8 +2300,14 @@ static int xfade_activate(AVFilterContext *avctx)
// We are transitioning, so we need a frame from second input
if (ff_inlink_check_available_frame(in_b)) {
int ret;
- ff_inlink_consume_frame(avctx->inputs[0], &s->xf[0]);
- ff_inlink_consume_frame(avctx->inputs[1], &s->xf[1]);
+ ret = ff_inlink_consume_frame(avctx->inputs[0], &s->xf[0]);
+ 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
if (s->inputs_offset_pts == AV_NOPTS_VALUE)
--
2.45.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
