From db99ca21500534d1ca3eecc1039f1f45394569e1 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Thu, 30 Jun 2022 20:11:20 +0200 Subject: [PATCH] avcodec/hevcdec: Check allocation Also postpone it after the checks for invalid input. Signed-off-by: Andreas Rheinhardt --- libavcodec/hevcdec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index b03cb15b7e..8f7c186b00 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2649,8 +2649,6 @@ static int hls_slice_data_wpp(HEVCContext *s, const H2645NAL *nal) goto error; } - ff_alloc_entries(s->avctx, s->sh.num_entry_point_offsets + 1); - for (i = 1; i < s->threads_number; i++) { if (s->HEVClcList[i]) continue; @@ -2704,6 +2702,9 @@ static int hls_slice_data_wpp(HEVCContext *s, const H2645NAL *nal) } atomic_store(&s->wpp_err, 0); + res = ff_alloc_entries(s->avctx, s->sh.num_entry_point_offsets + 1); + if (res < 0) + goto error; ff_reset_entries(s->avctx); for (i = 0; i <= s->sh.num_entry_point_offsets; i++) {