aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2015-07-11 00:09:46 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-12 16:12:36 +0200
commit189420cb561929e05f5cc4224cdca83740a24a32 (patch)
tree2194b3e2fdccfd4eae295a0f29a5e84a0c915bda
parent7da1f00e79eb2f04922a8c09d986fed178a386fe (diff)
downloadffmpeg-189420cb561929e05f5cc4224cdca83740a24a32.tar.gz
riffdec: prevent negative bit rate
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/riffdec.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c
index 5ae91634ad..f798baf128 100644
--- a/libavformat/riffdec.c
+++ b/libavformat/riffdec.c
@@ -107,6 +107,14 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
codec->bit_rate = avio_rb32(pb) * 8;
codec->block_align = avio_rb16(pb);
}
+ if (codec->bit_rate < 0) {
+ av_log(s, AV_LOG_WARNING,
+ "Invalid bit rate: %d\n", codec->bit_rate);
+ if (s->error_recognition & AV_EF_EXPLODE)
+ return AVERROR_INVALIDDATA;
+ else
+ codec->bit_rate = 0;
+ }
if (size == 14) { /* We're dealing with plain vanilla WAVEFORMAT */
codec->bits_per_coded_sample = 8;
} else {