diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-30 19:37:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-18 20:23:45 +0200 |
| commit | 65aac419e53a7f6ed6df1e6bebfc31c6aff3321a (patch) | |
| tree | 53cabc1aa907a5697e9da9cd1bcabbffce07866a | |
| parent | 662714abbe40249b09c9ef28c6111e8ceb00de58 (diff) | |
| download | ffmpeg-65aac419e53a7f6ed6df1e6bebfc31c6aff3321a.tar.gz | |
avcodec/h264_slice: Use w/h from the AVFrame instead of mb_w/h
Fixes out of array access
Fixes: asan_heap-oob_4d5bb0_682_cov_3124593265_Fraunhofer__a_driving_force_in_innovation__small.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 330863c9f19a23c500ba7901a23f1cc377b353bb)
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 0712f2d73a..968e3ecb83 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1558,8 +1558,8 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) (const uint8_t **)prev->f->data, prev->f->linesize, prev->f->format, - h->mb_width * 16, - h->mb_height * 16); + prev->f->width, + prev->f->height); h->short_ref[0]->poc = prev->poc + 2; } h->short_ref[0]->frame_num = h->prev_frame_num; |