diff options
| author | Dale Curtis <dalecurtis@chromium.org> | 2020-05-14 15:31:55 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-07-01 12:49:26 +0200 |
| commit | e26d6f68bb54f948d311ad037e040edd80190cc7 (patch) | |
| tree | ebd19583dddb0ea838b2ce154d679b77518fe71b | |
| parent | fa10782c02a331358c9db41a716ca235a5789af2 (diff) | |
| download | ffmpeg-e26d6f68bb54f948d311ad037e040edd80190cc7.tar.gz | |
avformat/mov: Don't allow negative sample sizes.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 2d8d554f15a7a27cfeca81467cc9341a86f784e2)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/mov.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 993e1ed252..929dbb4216 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2628,6 +2628,10 @@ static int mov_read_stsz(MOVContext *c, AVIOContext *pb, MOVAtom atom) for (i = 0; i < entries && !pb->eof_reached; i++) { sc->sample_sizes[i] = get_bits_long(&gb, field_size); + if (sc->sample_sizes[i] < 0) { + av_log(c->fc, AV_LOG_ERROR, "Invalid sample size %d\n", sc->sample_sizes[i]); + return AVERROR_INVALIDDATA; + } sc->data_size += sc->sample_sizes[i]; } |