Commit 22364a78 authored by michael's avatar michael

Check validity of channels & samplerate.

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


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19975 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 7baea658
......@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment