summaryrefslogtreecommitdiff
path: root/libavfilter/af_join.c
diff options
context:
space:
mode:
authorNikolas Bowe <nbowe-at-google.com@ffmpeg.org>2018-02-02 15:11:04 -0800
committerMichael Niedermayer <michael@niedermayer.cc>2018-02-03 21:37:19 +0100
commitc86490c49a3d0683b2f63338430a369c174e2bd5 (patch)
treec66d8385a02eba10f5505912235d66d1d1c6a3fd /libavfilter/af_join.c
parente3d946b3f48fa000e2ba917ecb1bf21e5fe947fb (diff)
avfilter/af_join: Fix crash in join filter
Previously if ff_outlink_frame_wanted() returned 0 it could dereference a null pointer when trying to read nb_samples. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavfilter/af_join.c')
-rw-r--r--libavfilter/af_join.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index cf5131e8dc..4f86e13558 100644
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -485,6 +485,9 @@ static int activate(AVFilterContext *ctx)
return 0;
}
}
+ if (!s->input_frames[0]) {
+ return 0;
+ }
}
nb_samples = s->input_frames[0]->nb_samples;