diff options
| author | Matt Wolenetz <wolenetz@google.com> | 2016-12-14 15:26:19 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-02-08 20:32:01 +0100 |
| commit | 02a5e88ebc725b09f675bfcbbd4db1133e41708e (patch) | |
| tree | 76ad6710bfd5e74ac0f4e5c2a8b5bc47b2cab347 | |
| parent | b6efd022b77349f2797afe756b791e82ec4a1d96 (diff) | |
| download | ffmpeg-02a5e88ebc725b09f675bfcbbd4db1133e41708e.tar.gz | |
lavf/mov.c: Avoid heap allocation wrap in mov_read_uuid
Core of patch is from paul@paulmehta.com
Reference https://crbug.com/643951
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Check value reduced as the code does not support values beyond INT_MAX
Also the check is moved to a more common place and before integer truncation
(cherry picked from commit 2d453188c2303da641dafb048dc1806790526dfd)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index e4e00ac992..268cd2785a 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3969,7 +3969,7 @@ static int mov_read_uuid(MOVContext *c, AVIOContext *pb, MOVAtom atom) 0x9c, 0x71, 0x99, 0x94, 0x91, 0xe3, 0xaf, 0xac }; - if (atom.size < sizeof(uuid) || atom.size == INT64_MAX) + if (atom.size < sizeof(uuid) || atom.size >= FFMIN(INT_MAX, SIZE_MAX)) return AVERROR_INVALIDDATA; ret = avio_read(pb, uuid, sizeof(uuid)); |