diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2012-01-05 21:40:18 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-01-08 09:40:38 +0100 |
| commit | efd453d82d5cd6c064644022a4153fe4bd45f8b7 (patch) | |
| tree | f673ae8d39c5a9f0854b5639a4b5ca4c2b7b08a7 | |
| parent | 7ee536e87a569174775dabdd959a9b12c1d2ac3d (diff) | |
| download | ffmpeg-efd453d82d5cd6c064644022a4153fe4bd45f8b7.tar.gz | |
vorbisdec: Fix decoding bug with channel handling
Fixes Bug: #191
Chromium Bug: #101458
CVE-2011-3895
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit e6d527ff729e42d80e4756cab779ff4ad693631b)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 97f23c72a3815739ab28e297ce60f943349f6939)
Conflicts:
libavcodec/vorbis_dec.c
(cherry picked from commit 42f0a6696889ba275aa2087b57fa99f7a97033a0)
Conflicts:
libavcodec/vorbis_dec.c
| -rw-r--r-- | libavcodec/vorbis_dec.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavcodec/vorbis_dec.c b/libavcodec/vorbis_dec.c index 5b8b056393..ebaa59da1c 100644 --- a/libavcodec/vorbis_dec.c +++ b/libavcodec/vorbis_dec.c @@ -654,7 +654,7 @@ static int vorbis_parse_setup_hdr_residues(vorbis_context *vc){ res_setup->partition_size=get_bits(gb, 24)+1; /* Validations to prevent a buffer overflow later. */ if (res_setup->begin>res_setup->end - || res_setup->end>vc->blocksize[1]/(res_setup->type==2?1:2) + || res_setup->end > (res_setup->type == 2 ? vc->avccontext->channels : 1) * vc->blocksize[1] / 2 || (res_setup->end-res_setup->begin)/res_setup->partition_size>V_MAX_PARTITIONS) { av_log(vc->avccontext, AV_LOG_ERROR, "partition out of bounds: type, begin, end, size, blocksize: %d, %d, %d, %d, %d\n", res_setup->type, res_setup->begin, res_setup->end, res_setup->partition_size, vc->blocksize[1]/2); return 1; @@ -1505,6 +1505,7 @@ static int vorbis_parse_audio_packet(vorbis_context *vc) { uint_fast8_t res_num=0; int_fast16_t retlen=0; float fadd_bias = vc->add_bias; + int ch_left = vc->audio_channels; if (get_bits1(gb)) { av_log(vc->avccontext, AV_LOG_ERROR, "Not a Vorbis I audio packet.\n"); @@ -1583,9 +1584,14 @@ static int vorbis_parse_audio_packet(vorbis_context *vc) { } } residue=&vc->residues[mapping->submap_residue[i]]; + if (ch_left < ch) { + av_log(vc->avccontext, AV_LOG_ERROR, "Too many channels in vorbis_floor_decode.\n"); + return -1; + } vorbis_residue_decode(vc, residue, ch, do_not_decode, ch_res_ptr, blocksize/2); ch_res_ptr+=ch*blocksize/2; + ch_left -= ch; } // Inverse coupling |