From: Michael Niedermayer Date: Thu, 10 Jan 2013 23:54:12 +0000 (+0100) Subject: vorbisdec: Error on bark_map_size equal to 0. X-Git-Tag: v10_alpha1~2212 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=11dcecfcca0eca1a571792c4fa3c21fb2cfddddc;p=platform%2Fupstream%2Flibav.git vorbisdec: Error on bark_map_size equal to 0. The value is used to calculate output LSP curve and a division by zero and out of array accesses would occur. CVE-2013-0894 CC: libav-stable@libav.org Reported-by: Dale Curtis Found-by: inferno@chromium.org Signed-off-by: Michael Niedermayer Signed-off-by: Luca Barbato --- diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index 158bd6f..600083b 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -586,6 +586,11 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) floor_setup->data.t0.order = get_bits(gb, 8); floor_setup->data.t0.rate = get_bits(gb, 16); floor_setup->data.t0.bark_map_size = get_bits(gb, 16); + if (floor_setup->data.t0.bark_map_size == 0) { + av_log(vc->avccontext, AV_LOG_ERROR, + "Floor 0 bark map size is 0.\n"); + return AVERROR_INVALIDDATA; + } floor_setup->data.t0.amplitude_bits = get_bits(gb, 6); /* zero would result in a div by zero later * * 2^0 - 1 == 0 */