wmalosslessdec: make mclms arrays big enough for whats written into them.
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Apr 2012 12:49:22 +0000 (14:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Mar 2014 03:23:59 +0000 (04:23 +0100)
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a0abefb0af64a311b15141062c77dd577ba590a3)

Conflicts:

libavcodec/wmalosslessdec.c

libavcodec/wmalosslessdec.c

index 2b32bcc..41bd067 100644 (file)
@@ -237,9 +237,9 @@ typedef struct WmallDecodeCtx {
     int8_t mclms_scaling;
     int16_t mclms_coeffs[128];
     int16_t mclms_coeffs_cur[4];
-    int16_t mclms_prevvalues[64];   // FIXME: should be 32-bit / 16-bit depending on bit-depth
-    int16_t mclms_updates[64];
-    int mclms_recent;
+    int16_t mclms_prevvalues[WMALL_MAX_CHANNELS * 2 * 32];
+    int16_t mclms_updates[WMALL_MAX_CHANNELS * 2 * 32];
+    int     mclms_recent;
 
     int movave_scaling;
     int quant_stepsize;