[SCM] libav/upstream.snapshot: wmapro: error out on impossible scale factor offsets

[siretart at users.alioth.debian.org]

The following commit has been merged in the upstream.snapshot branch:
commit efcfd50c9fec0670489d1c73b86d1247db29d8b3
Author: Luca Barbato <lu_zero at gentoo.org>
Date:   Sat Jun 29 02:16:50 2013 +0200

    wmapro: error out on impossible scale factor offsets
    
    Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
    CC: libav-stable at libav.org
    (cherry picked from commit 02ec656af72030eea4f3d63e30b25625cce6a3df)
    
    Signed-off-by: Reinhard Tartler <siretart at tauware.de>

diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c
index 392d146..ed9c6d3 100644
--- a/libavcodec/wmaprodec.c
+++ b/libavcodec/wmaprodec.c
@@ -439,7 +439,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;
             }
         }

-- 
Libav/FFmpeg packaging