]> git.sesse.net Git - ffmpeg/commitdiff
avfilter/af_pan: fix null pointer dereference on empty token
authorMarton Balint <cus@passwd.hu>
Sun, 5 Feb 2017 01:25:04 +0000 (02:25 +0100)
committerMarton Balint <cus@passwd.hu>
Sun, 5 Feb 2017 21:49:04 +0000 (22:49 +0100)
Fixes Coverity CID 1396254.

Signed-off-by: Marton Balint <cus@passwd.hu>
libavfilter/af_pan.c

index 94f15876f5f16068c1058783d31d93cd4fdf9607..a477bde460b001968d2a592b7c2aba42108f21ce 100644 (file)
@@ -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)