Commit 4ea4d2f4 authored by Michael Niedermayer's avatar Michael Niedermayer

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: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 9c35b8e2
...@@ -1097,6 +1097,7 @@ static int h264_slice_header_init(H264Context *h) ...@@ -1097,6 +1097,7 @@ static int h264_slice_header_init(H264Context *h)
nb_slices = max_slices; nb_slices = max_slices;
} }
h->slice_context_count = nb_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)) { if (!HAVE_THREADS || !(h->avctx->active_thread_type & FF_THREAD_SLICE)) {
ret = ff_h264_slice_context_init(h, &h->slice_ctx[0]); ret = ff_h264_slice_context_init(h, &h->slice_ctx[0]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment