Previously if ff_outlink_frame_wanted() returned 0 it could dereference a null 
pointer when trying to read nb_samples.
---
 libavfilter/af_join.c | 3 +++
 1 file changed, 3 insertions(+)

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;
-- 
2.16.0.rc1.238.g530d649a79-goog

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Reply via email to