aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-15 02:43:03 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-12 22:09:56 +0100
commit431cf16963fccd28051ee81e82d8dff1acac30dd (patch)
tree2eee7a9e1d3a8eaf1c1fd475a73a3a5b2da6e917
parente85296beae0a2a1ebe210c49cb6f13b8a37d8cf4 (diff)
downloadffmpeg-431cf16963fccd28051ee81e82d8dff1acac30dd.tar.gz
h264: check chroma_format_idc range.
Fixes Ticket758 Bug found by: Diana Elena Muscalu Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 7fff64e00d886fde11d61958888c82b461cf99b9) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/h264_ps.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index 7648e2c7a6..351d52b6c0 100644
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -297,6 +297,10 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){
if(sps->profile_idc >= 100){ //high profile
sps->chroma_format_idc= get_ue_golomb_31(&s->gb);
+ if (sps->chroma_format_idc > 3U) {
+ av_log(h->s.avctx, AV_LOG_ERROR, "chroma_format_idc %d is illegal\n", sps->chroma_format_idc);
+ goto fail;
+ }
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;