Module: libav Branch: release/9 Commit: 37e99e384e37364fca13dc6a70111adb1c356fa2
Author: Luca Barbato <[email protected]> Committer: Reinhard Tartler <[email protected]> Date: Sun Feb 24 12:30:30 2013 +0100 vorbisdec: Add missing checks Rate and order must not be 0 even if the specification does not say that explicitly. (cherry picked from commit 5b47c19bfda92273ae49e83db26a565afcaed80a) Signed-off-by: Reinhard Tartler <[email protected]> --- libavcodec/vorbisdec.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index aac9019..4b87ef9 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -585,7 +585,17 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) floor_setup->decode = vorbis_floor0_decode; floor_setup->data.t0.order = get_bits(gb, 8); + if (!floor_setup->data.t0.order) { + av_log(vc->avccontext, AV_LOG_ERROR, + "Floor 0 order is 0.\n"); + return AVERROR_INVALIDDATA; + } floor_setup->data.t0.rate = get_bits(gb, 16); + if (!floor_setup->data.t0.rate) { + av_log(vc->avccontext, AV_LOG_ERROR, + "Floor 0 rate is 0.\n"); + return AVERROR_INVALIDDATA; + } floor_setup->data.t0.bark_map_size = get_bits(gb, 16); floor_setup->data.t0.amplitude_bits = get_bits(gb, 6); /* zero would result in a div by zero later * _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
