ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Mon Apr 1 21:13:04 2024 -0300| [f492f1ac239da07970c363fb8c7f7a1aa5b5002a] | committer: James Almer
avformat/mov: ensure all items id referenced by a grid are valid Fixes: null pointer dereference Fixes: 67494/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-6528714521247744 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Tested-by: Michael Niedermayer <mich...@niedermayer.cc> Signed-off-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f492f1ac239da07970c363fb8c7f7a1aa5b5002a --- libavformat/mov.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 7bdeeb99f9..fb0113b149 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -9397,8 +9397,9 @@ static int mov_parse_tiles(AVFormatContext *s) for (int j = 0; j < grid->nb_tiles; j++) { int tile_id = grid->tile_id_list[j]; + int k; - for (int k = 0; k < mov->nb_heif_item; k++) { + for (k = 0; k < mov->nb_heif_item; k++) { HEIFItem *item = &mov->heif_item[k]; AVStream *st = item->st; @@ -9424,6 +9425,13 @@ static int mov_parse_tiles(AVFormatContext *s) break; } + if (k == grid->nb_tiles) { + av_log(s, AV_LOG_WARNING, "HEIF item id %d referenced by grid id %d doesn't " + "exist\n", + tile_id, grid->item->item_id); + ff_remove_stream_group(s, stg); + loop = 0; + } if (!loop) break; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
