commit 0bf8e22cdb0bbe7bc9cba9ba1046b5eae509098b
author Alexander Strange <astrange@ithinksw.com> Sat Mar 24 17:32:14 2012 -0400
committer Reinhard Tartler <siretart@tauware.de> Mon May 28 23:46:08 2012 +0200
tree 67f441334d1da10f61bb9b635df8a603b98fed4c
parent 7944a87ba8a6b1faf167d5b116dfa55233e0a697

h264: Add check for invalid chroma_format_idc

Fixes a crash when FF_DEBUG_PICT_INFO is used.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6ef4063957aa5025c8d2cd757b6a537e4b6874df)

Fixes: CVE-2012-0851

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 47132345184dc3d0ff962a57a1225564fe979548)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit c5f7c755cfccd7aa01010a2d566104c2b0fa6d86)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 00d2c432581cf61326973a1a48f2e63690b65515)

libavcodec/h264.c

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 3ea6133..c8b561d 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -7131,8 +7131,12 @@
 
     if(sps->profile_idc >= 100){ //high profile
         sps->chroma_format_idc= get_ue_golomb_31(&s->gb);
-        if(sps->chroma_format_idc == 3)
+        if(sps->chroma_format_idc > 3) {
+            av_log(h->s.avctx, AV_LOG_ERROR, "chroma_format_idc (%u) out of range\n", sps->chroma_format_idc);
+            return -1;
+        } else if(sps->chroma_format_idc == 3) {
             sps->residual_color_transform_flag = get_bits1(&s->gb);
+        }
         sps->bit_depth_luma   = get_ue_golomb(&s->gb) + 8;
         sps->bit_depth_chroma = get_ue_golomb(&s->gb) + 8;
         sps->transform_bypass = get_bits1(&s->gb);