diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-24 22:12:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-26 16:06:39 +0100 |
| commit | 6b91701de322031d7ceacecbda3d71948fb4da04 (patch) | |
| tree | af0631d54633b50fed0b8865c62f334f69d2bf3d /libavcodec | |
| parent | 1290c85c9d451eaf45bf552fa313ea7f6cccb3f3 (diff) | |
| download | ffmpeg-6b91701de322031d7ceacecbda3d71948fb4da04.tar.gz | |
avcodec/h264_slice: Limit max_contexts when slice_context_count is initialized
Fixes out of array access
Fixes: 1430e9c43fae47a24c179c7c54f94918/signal_sigsegv_421427_2049_f2192b6829ab6e0eefcb035329c03c60.264
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 4ea4d2f438c9a7eba37980c9a87be4b34943e4d5)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264_slice.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 9642dc55d6..041acfcd35 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1097,6 +1097,7 @@ static int h264_slice_header_init(H264Context *h) nb_slices = max_slices; } h->slice_context_count = nb_slices; + h->max_contexts = FFMIN(h->max_contexts, nb_slices); if (!HAVE_THREADS || !(h->avctx->active_thread_type & FF_THREAD_SLICE)) { ret = ff_h264_slice_context_init(h, &h->slice_ctx[0]); |