alac: Do bounds checking of lpc_order read from the bitstream
authorMartin Storsjö <martin@martin.st>
Fri, 27 Sep 2013 21:22:52 +0000 (00:22 +0300)
committerMartin Storsjö <martin@martin.st>
Sun, 29 Sep 2013 16:57:10 +0000 (19:57 +0300)
In lpc_prediction(), we write up to array element 'lpc_order' in
an array allocated to hold 'max_samples_per_frame' elements.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
libavcodec/alac.c

index 41d1f77..6d1ace3 100644 (file)
@@ -314,6 +314,9 @@ static int decode_element(AVCodecContext *avctx, AVFrame *frame, int ch_index,
             rice_history_mult[ch] = get_bits(&alac->gb, 3);
             lpc_order[ch]         = get_bits(&alac->gb, 5);
 
+            if (lpc_order[ch] >= alac->max_samples_per_frame)
+                return AVERROR_INVALIDDATA;
+
             /* read the predictor table */
             for (i = lpc_order[ch] - 1; i >= 0; i--)
                 lpc_coefs[ch][i] = get_sbits(&alac->gb, 16);