projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
35c39d2
)
riffdec: Add sanity checks for the sample rate
author
Martin Storsjö
<martin@martin.st>
Sat, 28 Sep 2013 20:32:39 +0000
(23:32 +0300)
committer
Luca Barbato
<lu_zero@gentoo.org>
Tue, 7 Jan 2014 08:43:57 +0000
(09:43 +0100)
This avoids a division by zero for G726.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit
d07aa3f02b73ab1371c13ac7898338380ca0932b
)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit
607863acaec85671f8c2afd81079ae4c605e3468
)
libavformat/riff.c
patch
|
blob
|
history
diff --git
a/libavformat/riff.c
b/libavformat/riff.c
index 4caac80643c6836815fd91517ca45f4332620ef2..2594bd2995f20419cb3c73e8fd5ebda24a0e6481 100644
(file)
--- a/
libavformat/riff.c
+++ b/
libavformat/riff.c
@@
-563,6
+563,11
@@
int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size)
if (size > 0)
avio_skip(pb, size);
}
+ if (codec->sample_rate <= 0) {
+ av_log(NULL, AV_LOG_ERROR,
+ "Invalid sample rate: %d\n", codec->sample_rate);
+ return AVERROR_INVALIDDATA;
+ }
codec->codec_id = ff_wav_codec_get_id(id, codec->bits_per_coded_sample);
if (codec->codec_id == CODEC_ID_AAC_LATM) {
/* channels and sample_rate values are those prior to applying SBR and/or PS */