On 7/16/2024 10:19 AM, Michael Niedermayer wrote:
Fixes: Timeout
Fixes: 
69230/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-6540512101203968

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
  libavformat/mov.c | 5 +++++
  1 file changed, 5 insertions(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index ce95842ce58..9042753d221 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -8925,6 +8925,11 @@ static int mov_read_iprp(MOVContext *c, AVIOContext *pb, 
MOVAtom atom)
      flags   = avio_rb24(pb);
      count   = avio_rb32(pb);
+ if (count * 5LL > a.size) {
+        ret = AVERROR_INVALIDDATA;
+        goto fail;
+    }

a.size is also read from the aviocontext, so i think it'd be better to add an avio_feof() check inside the for loop below, after assoc_count is read.

+
      for (int i = 0; i < count; i++) {
          int item_id = version ? avio_rb32(pb) : avio_rb16(pb);
          int assoc_count = avio_r8(pb);
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

Reply via email to