diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2010-02-09 19:42:30 +0000 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2010-02-09 19:42:30 +0000 |
| commit | beb0dc5f362a2789978c95f783e530940b1c905d (patch) | |
| tree | 1c8e6eb6c3601e6ebe027a556ce7282a6597e914 | |
| parent | f3fd4286970c018d57e4c31423a71de82d16a149 (diff) | |
Check dimensions against 0 too.
39_vorbis_zero_dims.patch from chrome
backport r19976 by michael
Originally committed as revision 21721 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
| -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 6ca8763bb3..a1e33babc6 100644 --- a/libavcodec/vorbis_dec.c +++ b/libavcodec/vorbis_dec.c @@ -249,8 +249,8 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) { } codebook_setup->dimensions=get_bits(gb, 16); - if (codebook_setup->dimensions>16) { - av_log(vc->avccontext, AV_LOG_ERROR, " %"PRIdFAST16". Codebook's dimension is too large (%d). \n", cb, codebook_setup->dimensions); + if (codebook_setup->dimensions>16||codebook_setup->dimensions==0) { + av_log(vc->avccontext, AV_LOG_ERROR, " %"PRIdFAST16". Codebook's dimension is invalid (%d). \n", cb, codebook_setup->dimensions); goto error; } entries=get_bits(gb, 24); |