diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-06-10 00:13:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-06-10 00:48:23 +0200 |
| commit | 09096fb68713089a8f97c8fa24e9d7f3bb9231d5 (patch) | |
| tree | 0f69522bb118bea51806a950b36e3551778df981 /libavcodec/h264_slice.c | |
| parent | e1b0044c234775bf99ab1a5c794240a9a692ad8d (diff) | |
| download | ffmpeg-09096fb68713089a8f97c8fa24e9d7f3bb9231d5.tar.gz | |
avcodec/h264_parse: Check picture structure when initializing weight table
Fixes: runtime error: index 49 out of bounds for type 'int [48][2][2]'
Fixes: 2159/clusterfuzz-testcase-minimized-5267945972301824
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 8ba23712a1..23ca32a39d 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1801,7 +1801,8 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl, (pps->weighted_bipred_idc == 1 && sl->slice_type_nos == AV_PICTURE_TYPE_B)) { ret = ff_h264_pred_weight_table(&sl->gb, sps, sl->ref_count, - sl->slice_type_nos, &sl->pwt, h->avctx); + sl->slice_type_nos, &sl->pwt, + picture_structure, h->avctx); if (ret < 0) return ret; } |