[FFmpeg-devel] [PATCH] avformat/mov: fix crash when stsz_sample_size is zero and sample_sizes is null (PR #21011)

[Zhao Zhili via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>]

PR #21011 opened by Zhao Zhili (quink)
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21011
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21011.patch


>From 4767a3f1377acf4e092988d59bd0d3983fef9fdb Mon Sep 17 00:00:00 2001
From: Zhao Zhili <zhilizhao@tencent.com>
Date: Tue, 25 Nov 2025 13:00:34 +0800
Subject: [PATCH] avformat/mov: fix crash when stsz_sample_size is zero and
 sample_sizes is null

---
 libavformat/mov.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index ef190106f9..3c8e9e3ee0 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -4805,6 +4805,10 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
                 av_log(mov->fc, AV_LOG_WARNING, "STSZ sample size %d invalid (too small), ignoring\n", sc->stsz_sample_size);
                 sc->stsz_sample_size = sc->sample_size;
             }
+            if (!sc->stsz_sample_size && !sc->sample_sizes) {
+                av_log(mov->fc, AV_LOG_ERROR, "no stsz_sample_size and sample size table\n");
+                return;
+            }
 
             for (j = 0; j < sc->stsc_data[stsc_index].count; j++) {
                 int keyframe = 0;
-- 
2.49.1

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org