snow: reject unsupported chroma shifts.

Message ID 20120314210238.D3F765E088@aruru.libav.org
State New
Headers show

Commit Message

Janne Grunau March 14, 2012, 9:02 p.m.
Module: libav
Branch: release/0.8
Commit: c9e95636a893225e2a5a42ba6e1e3cf6bfd59f2b

Author:    Michael Niedermayer <michaelni@gmx.at>
Committer: Reinhard Tartler <siretart@tauware.de>
Date:      Sat Mar 10 00:08:32 2012 +0100

snow: reject unsupported chroma shifts.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit c9837954e7b968d44f82e7cdb7618e9f523b196c)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>

---

 libavcodec/snowdec.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

Patch

diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c
index 2b6f6e1..d9f61bc 100644
--- a/libavcodec/snowdec.c
+++ b/libavcodec/snowdec.c
@@ -327,6 +327,11 @@  static int decode_header(SnowContext *s){
         return -1;
     }
 
+    if (s->chroma_h_shift != 1 || s->chroma_v_shift != 1) {
+        av_log(s->avctx, AV_LOG_ERROR, "Invalid chroma shift\n");
+        return AVERROR_PATCHWELCOME;
+    }
+
     s->qlog           += get_symbol(&s->c, s->header_state, 1);
     s->mv_scale       += get_symbol(&s->c, s->header_state, 1);
     s->qbias          += get_symbol(&s->c, s->header_state, 1);