Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

westwood: Make sure audio header info is present when parsing audio packets

Browse source 
Audio header information might get scrambled and would not parse,
yet wsqva_read_packet would try to parse audio packets causing
segfaults such as floating point exception.

Fixes bugzilla #141.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Shitiz Garg 2011-12-15 14:32:59 +05:30 • committed by Martin Storsjö
parent 1b35af3225
commit 566ee0eaf1
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libavformat/westwood.c
View file

@ -326,6 +326,11 @@ static int wsvqa_read_packet(AVFormatContext *s,
chunk_size = AV_RB32(&preamble[4]);
skip_byte = chunk_size & 0x01;
if ((chunk_type == SND2_TAG || chunk_type == SND1_TAG) && wsvqa->audio_channels == 0) {
av_log(s, AV_LOG_ERROR, "audio chunk without any audio header information found\n");
return AVERROR_INVALIDDATA;
}
if ((chunk_type == SND1_TAG) || (chunk_type == SND2_TAG) || (chunk_type == VQFR_TAG)) {
if (av_new_packet(pkt, chunk_size))