summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorDale Curtis <dalecurtis@chromium.org>2020-05-14 15:31:55 -0700
committerMichael Niedermayer <michael@niedermayer.cc>2020-05-15 22:03:36 +0200
commit2d8d554f15a7a27cfeca81467cc9341a86f784e2 (patch)
treec03a2b241a47be2df0e38662a1efc4b420a9054d /libavformat
parented7d73355eea21e08eea01f8fabc1644f15b66e4 (diff)
avformat/mov: Don't allow negative sample sizes.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mov.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index ad718cdaa2..93648994eb 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2885,6 +2885,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];
}