[FFmpeg-cvslog] r21721 - in branches/0.5: . libavcodec/vorbis_dec.c
siretart
subversion
Tue Feb 9 20:42:30 CET 2010
Author: siretart
Date: Tue Feb 9 20:42:30 2010
New Revision: 21721
Log:
Check dimensions against 0 too.
39_vorbis_zero_dims.patch from chrome
backport r19976 by michael
Modified:
branches/0.5/ (props changed)
branches/0.5/libavcodec/vorbis_dec.c
Modified: branches/0.5/libavcodec/vorbis_dec.c
==============================================================================
--- branches/0.5/libavcodec/vorbis_dec.c Tue Feb 9 20:31:04 2010 (r21720)
+++ branches/0.5/libavcodec/vorbis_dec.c Tue Feb 9 20:42:30 2010 (r21721)
@@ -249,8 +249,8 @@ static int vorbis_parse_setup_hdr_codebo
}
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);
More information about the ffmpeg-cvslog
mailing list