diff options
| author | Matt Wolenetz <wolenetz@google.com> | 2016-12-14 15:26:19 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-02-08 04:08:48 +0100 |
| commit | ed2572b9c8f885e2a4764d2e34604442a71899a1 (patch) | |
| tree | ea9df753faeac5ddc9b13638e1344a7f7c3d6fbb | |
| parent | cf8e004a51b08c6e8ceaeebca85ab84c7ed0b4cf (diff) | |
| download | ffmpeg-ed2572b9c8f885e2a4764d2e34604442a71899a1.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 17d0475aae..74b5825578 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4436,7 +4436,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)); |