| Message ID | 20220201185239.13450-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 948c26209979cef9d052531fcf9f1281cd8e0213 |
| Headers | show |
| Series | [FFmpeg-devel,1/2] avformat/utils: keep chapter monotonicity on chapter updates | expand |
On Tue, Feb 01, 2022 at 07:52:38PM +0100, Michael Niedermayer wrote: > 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@niedermayer.cc> > --- > libavformat/utils.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) will apply thx [...]
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) {
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@niedermayer.cc> --- libavformat/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)