[FFmpeg-cvslog] h264: check for invalid bit depth value.

Laurent Aimar git at videolan.org
Sun Oct 2 21:37:22 CEST 2011


ffmpeg | branch: release/0.8 | Laurent Aimar <fenrir at videolan.org> | Sun Oct  2 18:29:31 2011 +0200| [efedf09378e82cc75d56e881842c5bf14b2c9d05] | committer: Michael Niedermayer

h264: check for invalid bit depth value.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit c2b7f7748be447e1446f63b13da472ba7e00f329)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=efedf09378e82cc75d56e881842c5bf14b2c9d05
---

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

diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index 4342c4b..423f54b 100644
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -346,6 +346,11 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){
             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;
+        if (sps->bit_depth_luma > 12U || sps->bit_depth_chroma > 12U) {
+            av_log(h->s.avctx, AV_LOG_ERROR, "illegal bit depth value (%d, %d)\n",
+                   sps->bit_depth_luma, sps->bit_depth_chroma);
+            goto fail;
+        }
         sps->transform_bypass = get_bits1(&s->gb);
         decode_scaling_matrices(h, sps, NULL, 1, sps->scaling_matrix4, sps->scaling_matrix8);
     }else{



More information about the ffmpeg-cvslog mailing list