h264: check for luma and chroma bit dept being equal
authorLuca Barbato <lu_zero@gentoo.org>
Mon, 4 Mar 2013 10:21:08 +0000 (11:21 +0100)
committerLuca Barbato <lu_zero@gentoo.org>
Tue, 5 Mar 2013 21:18:02 +0000 (22:18 +0100)
The decoder assumes a single bit depth for all the planes
while the specification allows different bit depths for luma
and chroma.

Avoid the possible problems described in CVE-2013-2277

CC: libav-stable@libav.org
libavcodec/h264.c

index e7186c8..0b22613 100644 (file)
@@ -2745,6 +2745,12 @@ static int h264_set_parameter_from_sps(H264Context *h)
     if (h->avctx->has_b_frames < 2)
         h->avctx->has_b_frames = !h->low_delay;
 
+    if (h->sps.bit_depth_luma != h->sps.bit_depth_chroma) {
+        av_log_missing_feature(h->avctx,
+            "Different bit depth between chroma and luma", 1);
+        return AVERROR_PATCHWELCOME;
+    }
+
     if (h->avctx->bits_per_raw_sample != h->sps.bit_depth_luma ||
         h->cur_chroma_format_idc      != h->sps.chroma_format_idc) {
         if (h->avctx->codec &&