From c86490c49a3d0683b2f63338430a369c174e2bd5 Mon Sep 17 00:00:00 2001
From: Nikolas Bowe <nbowe-at-google.com@ffmpeg.org>
Date: Fri, 2 Feb 2018 15:11:04 -0800
Subject: [PATCH] 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>
---
libavfilter/af_join.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index cf5131e8dca..4f86e135584 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;
--
GitLab