[libav-stable] h264: check for luma and chroma bit dept being equal

Reinhard Tartler siretart at tauware.de
Wed Mar 6 17:49:58 CET 2013


On Wed, Mar 06, 2013 at 16:13:23 (CET), Luca Barbato  wrote:

> Module: libav
> Branch: master
> Commit: 4987faee78b9869f8f4646b8dd971d459df218a5
>
> Author:    Luca Barbato <lu_zero at gentoo.org>
> Committer: Luca Barbato <lu_zero at gentoo.org>
> Date:      Mon Mar  4 11:21:08 2013 +0100
>
> h264: check for luma and chroma bit dept being equal
>
> 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 at libav.org
>
> ---
>
>  libavcodec/h264.c |    6 ++++++
>  1 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/libavcodec/h264.c b/libavcodec/h264.c
> index e7186c8..0b22613 100644
> --- a/libavcodec/h264.c
> +++ b/libavcodec/h264.c
> @@ -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 &&
>

Patch OK for stable
-- 
Gruesse/greetings,
Reinhard Tartler, KeyID 945348A4


More information about the libav-stable mailing list