[FFmpeg-cvslog] avformat/utils: keep chapter monotonicity on chapter updates
Michael Niedermayer
git at videolan.org
Wed Feb 9 12:40:26 EET 2022
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Feb 1 18:28:16 2022 +0100| [948c26209979cef9d052531fcf9f1281cd8e0213] | committer: Michael Niedermayer
avformat/utils: keep chapter monotonicity on chapter updates
Updating a chapter with the same id does not break monotonicity
Fixes: Timeout
Fixes: 43727/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-4960623367159808
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=948c26209979cef9d052531fcf9f1281cd8e0213
---
libavformat/utils.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index e643821fc9..940703e87d 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -895,10 +895,11 @@ AVChapter *avpriv_new_chapter(AVFormatContext *s, int64_t id, AVRational time_ba
if (!s->nb_chapters) {
si->chapter_ids_monotonic = 1;
} else if (!si->chapter_ids_monotonic || s->chapters[s->nb_chapters-1]->id >= id) {
- si->chapter_ids_monotonic = 0;
for (unsigned i = 0; i < s->nb_chapters; i++)
if (s->chapters[i]->id == id)
chapter = s->chapters[i];
+ if (!chapter)
+ si->chapter_ids_monotonic = 0;
}
if (!chapter) {
More information about the ffmpeg-cvslog
mailing list