diff options
| author | Denes Balatoni <dbalatoni@programozo.hu> | 2007-07-17 07:12:40 +0000 |
|---|---|---|
| committer | Benoit Fouet <benoit.fouet@free.fr> | 2007-07-17 07:12:40 +0000 |
| commit | 975741e79cedc6033e5b02319792534a3a42c4ae (patch) | |
| tree | f6e79cf23b9541512f5576bb2504fae2740d9375 | |
| parent | 263c2412269c954726b13e4fa7f120abe10c182f (diff) | |
| download | ffmpeg-975741e79cedc6033e5b02319792534a3a42c4ae.tar.gz | |
Don't segfault if an empty codebook gets used.
Patch by Denes Balatoni: [ dbalatoni interware hu ]
Original thread: [Ffmpeg-devel] [PATCH/BUGREPORT] crash in vorbis decoder
date: 02/04/2007 11:08 PM
Originally committed as revision 9711 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/vorbis_dec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vorbis_dec.c b/libavcodec/vorbis_dec.c index 290423c847..32619655c7 100644 --- a/libavcodec/vorbis_dec.c +++ b/libavcodec/vorbis_dec.c @@ -351,7 +351,7 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) { } // Weed out unused vlcs and build codevector vector - codebook_setup->codevectors=(float *)av_mallocz(used_entries*codebook_setup->dimensions * sizeof(float)); + codebook_setup->codevectors=used_entries ? (float *)av_mallocz(used_entries*codebook_setup->dimensions * sizeof(float)) : NULL; for(j=0, i=0;i<entries;++i) { uint_fast8_t dim=codebook_setup->dimensions; @@ -1291,7 +1291,7 @@ static int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, uint_fa uint_fast8_t vqclass=classifs[j_times_ptns_to_read+partition_count]; int_fast16_t vqbook=vr->books[vqclass][pass]; - if (vqbook>=0) { + if (vqbook>=0 && vc->codebooks[vqbook].codevectors) { uint_fast16_t coffs; unsigned dim= vc->codebooks[vqbook].dimensions; // not uint_fast8_t: 64bit is slower here on amd64 uint_fast16_t step= dim==1 ? vr->partition_size |