ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri May 15 00:30:32 2015 +0200| [47cbcf20d6f2e37293a059ff6ac300f86c4c346f] | committer: Michael Niedermayer
avcodec/h264_slice: Fix ranges in assert Fixes CID1297592, CID1297593 Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47cbcf20d6f2e37293a059ff6ac300f86c4c346f --- libavcodec/h264_slice.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 9188eb4..2064496 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -397,9 +397,9 @@ static void copy_picture_range(H264Picture **to, H264Picture **from, int count, int i; for (i = 0; i < count; i++) { - av_assert1((IN_RANGE(from[i], old_base, sizeof(*old_base)) || + av_assert1((IN_RANGE(from[i], old_base, 1) || IN_RANGE(from[i], old_base->DPB, - sizeof(H264Picture) * H264_MAX_PICTURE_COUNT) || + H264_MAX_PICTURE_COUNT) || !from[i])); to[i] = REBASE_PICTURE(from[i], new_base, old_base); } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog