alac: Reject rice_limit 0 if compression is used

Message ID 20150510150250.A49EF31@aruru.libav.org
State New
Headers show

Commit Message

Janne Grunau May 10, 2015, 3:02 p.m.
Module: libav
Branch: master
Commit: 243e8443cd9e83c887e3f5edf09a169e7783d14e

Author:    Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Committer: Luca Barbato <lu_zero@gentoo.org>
Date:      Fri Apr 24 00:01:43 2015 +0200

alac: Reject rice_limit 0 if compression is used

If in compression mode rice_limit = 0 leads to call
`show_bits(gb, k)` in `decode_scalar` with k = 0.

Request a sample in case it is valid and it should be accepted.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

CC: libav-stable@libav.org

---

 libavcodec/alac.c |    6 ++++++
 1 file changed, 6 insertions(+)

Patch

diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index 48903a6..9579e18 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -307,6 +307,12 @@  static int decode_element(AVCodecContext *avctx, AVFrame *frame, int ch_index,
         int lpc_quant[2];
         int rice_history_mult[2];
 
+        if (!alac->rice_limit) {
+            avpriv_request_sample(alac->avctx,
+                                  "Compression with rice limit 0");
+            return AVERROR(ENOSYS);
+        }
+
         decorr_shift       = get_bits(&alac->gb, 8);
         decorr_left_weight = get_bits(&alac->gb, 8);