Commit aedc98b0 authored by Google Chrome's avatar Google Chrome Committed by Michael Niedermayer
Browse files

Check submap indexes.

10_vorbis_submap_indexes.patch by chrome.
I am applying this even though Reimar had some comments to improve it as it fixes
a serious security issue and I do not want to leave such things unfixed.

Originally committed as revision 20001 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 9bda7f30
......@@ -752,9 +752,20 @@ static int vorbis_parse_setup_hdr_mappings(vorbis_context *vc) {
}
for(j=0;j<mapping_setup->submaps;++j) {
int bits;
skip_bits(gb, 8); // FIXME check?
mapping_setup->submap_floor[j]=get_bits(gb, 8);
mapping_setup->submap_residue[j]=get_bits(gb, 8);
bits=get_bits(gb, 8);
if (bits>=vc->floor_count) {
av_log(vc->avccontext, AV_LOG_ERROR, "submap floor value %d out of range. \n", bits);
return -1;
}
mapping_setup->submap_floor[j]=bits;
bits=get_bits(gb, 8);
if (bits>=vc->residue_count) {
av_log(vc->avccontext, AV_LOG_ERROR, "submap residue value %d out of range. \n", bits);
return -1;
}
mapping_setup->submap_residue[j]=bits;
AV_DEBUG(" %d mapping %d submap : floor %d, residue %d \n", i, j, mapping_setup->submap_floor[j], mapping_setup->submap_residue[j]);
}
......
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