[FFmpeg-cvslog] h264: check chroma_format_idc range.
Michael Niedermayer
git at videolan.org
Thu Jan 12 22:03:06 CET 2012
ffmpeg | branch: release/0.8 | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 15 02:43:03 2011 +0100| [8454d81ebe672e33022bc06e461676ca6d7b3299] | committer: Michael Niedermayer
h264: check chroma_format_idc range.
Fixes Ticket758
Bug found by: Diana Elena Muscalu
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 7fff64e00d886fde11d61958888c82b461cf99b9)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8454d81ebe672e33022bc06e461676ca6d7b3299
---
libavcodec/h264_ps.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index 89e2502..680db1e 100644
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -342,6 +342,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;
More information about the ffmpeg-cvslog
mailing list