aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-10-16 22:42:32 +0200
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-11-27 00:28:02 +0100
commitd4f64a0f545e48224e985b50848153f0b779b8ff (patch)
tree62c36357f2f27958a1b5147355a1c13a2f098f39
parentb3991ccd1170d84f5b5d84566b0c78a42724a073 (diff)
downloadffmpeg-d4f64a0f545e48224e985b50848153f0b779b8ff.tar.gz
westwood_aud: prevent division by zero
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit bc7e128a6e8e2a79d0ff7cab5e8a799b3ea042ea) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-rw-r--r--libavformat/westwood_aud.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/westwood_aud.c b/libavformat/westwood_aud.c
index 4750167f13..9c2d35cb8a 100644
--- a/libavformat/westwood_aud.c
+++ b/libavformat/westwood_aud.c
@@ -164,6 +164,12 @@ static int wsaud_read_packet(AVFormatContext *s,
if (ret != chunk_size)
return AVERROR(EIO);
+ if (st->codecpar->channels <= 0) {
+ av_log(s, AV_LOG_ERROR, "invalid number of channels %d\n",
+ st->codecpar->channels);
+ return AVERROR_INVALIDDATA;
+ }
+
/* 2 samples/byte, 1 or 2 samples per frame depending on stereo */
pkt->duration = (chunk_size * 2) / st->codecpar->channels;
}