diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-15 00:30:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-15 00:30:32 +0200 |
| commit | 47cbcf20d6f2e37293a059ff6ac300f86c4c346f (patch) | |
| tree | 3a41a57a2356389ca5632b391abc5f0d88603f08 | |
| parent | 9f0b898e8258a9a51b290f4c145388d62080f868 (diff) | |
| download | ffmpeg-47cbcf20d6f2e37293a059ff6ac300f86c4c346f.tar.gz | |
avcodec/h264_slice: Fix ranges in assert
Fixes CID1297592, CID1297593
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264_slice.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 9188eb471e..2064496775 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); } |