virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
Code Issues Releases Activity

Check validity of channels & samplerate.

Browse Source 
This may be security relevant.
Based on 2 patches by chrome.

backport r19975 by michael




Originally committed as revision 22658 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
This commit is contained in:
Reinhard Tartler 2010-03-24 19:35:30 +00:00
parent 7fd4cbb519
commit 96ca078b22
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/vorbis_dec.c
View File

@ -902,8 +902,16 @@ static int vorbis_parse_id_hdr(vorbis_context *vc){
}
vc->version=get_bits_long(gb, 32); //FIXME check 0
vc->audio_channels=get_bits(gb, 8); //FIXME check >0
vc->audio_samplerate=get_bits_long(gb, 32); //FIXME check >0
vc->audio_channels=get_bits(gb, 8);
if(vc->audio_channels <= 0){
av_log(vc->avccontext, AV_LOG_ERROR, "Invalid number of channels\n");
return -1;
}
vc->audio_samplerate=get_bits_long(gb, 32);
if(vc->audio_samplerate <= 0){
av_log(vc->avccontext, AV_LOG_ERROR, "Invalid samplerate\n");
return -1;
}
vc->bitrate_maximum=get_bits_long(gb, 32);
vc->bitrate_nominal=get_bits_long(gb, 32);
vc->bitrate_minimum=get_bits_long(gb, 32);