]> git.sesse.net Git - ffmpeg/commitdiff
avformat/mov: Extend data_size check in mov_read_udta_string()
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 12 Dec 2020 23:08:46 +0000 (00:08 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 1 Mar 2021 19:19:15 +0000 (20:19 +0100)
Fixes: signed integer overflow: -2147483634 - 16 cannot be represented in type 'int'
Fixes: 28322/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5711888402612224
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/mov.c

index f5e0c69ef39eb8a8f2347c86a5ecc5cf2b0aaa39..1c07cff6b5c99a49b4e13c657c582d0fed13cd82 100644 (file)
@@ -404,7 +404,7 @@ retry:
     if (c->itunes_metadata && atom.size > 8) {
         int data_size = avio_rb32(pb);
         int tag = avio_rl32(pb);
-        if (tag == MKTAG('d','a','t','a') && data_size <= atom.size) {
+        if (tag == MKTAG('d','a','t','a') && data_size <= atom.size && data_size >= 16) {
             data_type = avio_rb32(pb); // type
             avio_rb32(pb); // unknown
             str_size = data_size - 16;