OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
326b1ed
)
avfilter/af_pan: fix null pointer dereference on empty token
author
Marton Balint
<cus@passwd.hu>
Sun, 5 Feb 2017 01:25:04 +0000
(
02:25
+0100)
committer
Marton 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
patch
|
blob
|
history
diff --git
a/libavfilter/af_pan.c
b/libavfilter/af_pan.c
index
94f1587
..
a477bde
100644
(file)
--- 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)