From 3ece3ded0cb3c9dde6d9b7c1085264ca65f698ae Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 21 Jun 2025 23:15:17 +0200 Subject: [PATCH] avformat/mov: Check that sample_count is allocated in mov_parse_heif_items() Fixes: NULL pointer dereference Fixes: 416811958/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5425269114732544 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: James Almer Signed-off-by: Michael Niedermayer (cherry picked from commit 0ffe97d9b9e10e88db29d8d910c24ec00ef24edc) Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index b9761efbac..cd1846798a 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -10142,7 +10142,7 @@ static int mov_parse_heif_items(AVFormatContext *s) st->codecpar->height = item->height; err = sanity_checks(s, sc, item->item_id); - if (err) + if (err || !sc->sample_count) return AVERROR_INVALIDDATA; sc->sample_sizes[0] = item->extent_length;