aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Aimar <fenrir@videolan.org>2011-10-02 18:29:31 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-02 21:30:14 +0200
commitefedf09378e82cc75d56e881842c5bf14b2c9d05 (patch)
treefc2126bfe82968656e7610a1887149947e3270a8
parent46edabac3c97669d491016903d0f9014692dfcaa (diff)
downloadffmpeg-efedf09378e82cc75d56e881842c5bf14b2c9d05.tar.gz
h264: check for invalid bit depth value.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c2b7f7748be447e1446f63b13da472ba7e00f329)
-rw-r--r--libavcodec/h264_ps.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index 4342c4b1ec..423f54b324 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{