ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

riffdec: prevent negative bit rate

Browse Source 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 189420cb56)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
Andreas Cadhalpun 2015-07-11 00:09:46 +02:00
parent 68c0d66d4d
commit 16cbc7a930
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/riffdec.c
View File

@ -91,6 +91,14 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
codec->sample_rate = avio_rl32(pb); codec->sample_rate = avio_rl32(pb);
codec->bit_rate = avio_rl32(pb) * 8; codec->bit_rate = avio_rl32(pb) * 8;
codec->block_align = avio_rl16(pb); codec->block_align = avio_rl16(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 */ if (size == 14) { /* We're dealing with plain vanilla WAVEFORMAT */
codec->bits_per_coded_sample = 8; codec->bits_per_coded_sample = 8;
} else } else