Hi, On Sat, Mar 24, 2012 at 3:30 PM, Alexander Strange <[email protected]> wrote: > On Sat, Mar 24, 2012 at 5:55 PM, Ronald S. Bultje <[email protected]> wrote: >> Hi, >> >> On Sat, Mar 24, 2012 at 2:32 PM, Alexander Strange >> <[email protected]> wrote: >>> Fixes a crash when FF_DEBUG_PICT_INFO is used. >>> --- >>> libavcodec/h264_ps.c | 6 +++++- >>> 1 file changed, 5 insertions(+), 1 deletion(-) >>> >>> diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c >>> index 276eb77..05f04af 100644 >>> --- a/libavcodec/h264_ps.c >>> +++ b/libavcodec/h264_ps.c >>> @@ -332,8 +332,12 @@ 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 == 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); >>> + } >> >> LGTM - though perhaps AVERROR_INVALIDDATA is nicer than -1? >> >> Ronald > > Actually, that part was wrong... it caused a memory leak. Attached a > fixed patch rather than figure out git send-email again. > > All the 'goto fail' clauses in this function do just return -1; I can > add more specific errors in another patch.
Ohright, pushed that also. Ronald _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
