From f16aa5843ff9ac7de26fc22e85684ff4ea1cad4f Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Sat, 29 Jun 2013 02:16:50 +0200 Subject: [PATCH] wmapro: error out on impossible scale factor offsets Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 02ec656af72030eea4f3d63e30b25625cce6a3df) Signed-off-by: Reinhard Tartler --- libavcodec/wmaprodec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index 1e3d99a941..902c4e32bd 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -435,7 +435,8 @@ static av_cold int decode_init(AVCodecContext *avctx) for (x = 0; x < num_possible_block_sizes; x++) { int v = 0; while (s->sfb_offsets[x][v + 1] << x < offset) - ++v; + if (++v >= MAX_BANDS) + return AVERROR_INVALIDDATA; s->sf_offsets[i][x][b] = v; } }