RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 330863c9f1)

Conflicts:

	libavcodec/h264_slice.c
This commit is contained in:
Michael Niedermayer 2015-06-30 19:37:12 +02:00 committed by Michael Niedermayer
parent 002bbc3687
commit 11142fb83b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/h264_slice.c
View File

@ -1678,8 +1678,8 @@ int ff_h264_decode_slice_header(H264Context *h, H264Context *h0)
(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;