RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Check validity of channels & samplerate. 

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

Originally committed as revision 19975 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2009-09-23 07:46:51 +00:00
parent 428984b041
commit 9062cd3544
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

@ -848,8 +848,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);