diff options
| author | Zhao Zhili <quinkblack@foxmail.com> | 2020-07-05 00:51:53 +0800 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-10-09 22:02:19 +0200 |
| commit | 177fb0566012b671a49afa015065dd9481adc003 (patch) | |
| tree | bab02135c3b08ec41eae059af20418e296c6ec27 | |
| parent | 9704e1ac08ab09b587b8a5f7512eab43d9ba0c3e (diff) | |
| download | ffmpeg-177fb0566012b671a49afa015065dd9481adc003.tar.gz | |
avformat/mov: Fix unaligned read of uint32_t and endian-dependance in mov_read_default
Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 806a4d5187aeb82b97898683242886ed1e84f894)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/mov.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 7748446573..fa969ebb28 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4987,13 +4987,12 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (a.type == MKTAG('f','r','e','e') && a.size >= 8 && c->moov_retry) { - uint8_t buf[8]; - uint32_t *type = (uint32_t *)buf + 1; - if (avio_read(pb, buf, 8) != 8) - return AVERROR_INVALIDDATA; + uint32_t type; + avio_skip(pb, 4); + type = avio_rl32(pb); avio_seek(pb, -8, SEEK_CUR); - if (*type == MKTAG('m','v','h','d') || - *type == MKTAG('c','m','o','v')) { + if (type == MKTAG('m','v','h','d') || + type == MKTAG('c','m','o','v')) { av_log(c->fc, AV_LOG_ERROR, "Detected moov in a free atom.\n"); a.type = MKTAG('m','o','o','v'); } |