[FFmpeg-cvslog] avfilter/af_pan: fix null pointer dereference on empty token
Marton Balint
git at videolan.org
Sun Feb 5 23:59:05 EET 2017
ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Sun Feb 5 02:25:04 2017 +0100| [e57fd926b09156fd8da42876e8946490025c47d4] | committer: Marton Balint
avfilter/af_pan: fix null pointer dereference on empty token
Fixes Coverity CID 1396254.
Signed-off-by: Marton Balint <cus at passwd.hu>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e57fd926b09156fd8da42876e8946490025c47d4
---
libavfilter/af_pan.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c
index 94f1587..a477bde 100644
--- a/libavfilter/af_pan.c
+++ b/libavfilter/af_pan.c
@@ -115,6 +115,11 @@ static av_cold int init(AVFilterContext *ctx)
if (!args)
return AVERROR(ENOMEM);
arg = av_strtok(args, "|", &tokenizer);
+ if (!arg) {
+ av_log(ctx, AV_LOG_ERROR, "Channel layout not specified\n");
+ ret = AVERROR(EINVAL);
+ goto fail;
+ }
ret = ff_parse_channel_layout(&pan->out_channel_layout,
&pan->nb_output_channels, arg, ctx);
if (ret < 0)
More information about the ffmpeg-cvslog
mailing list