diff options
| author | Martin Storsjö <martin@martin.st> | 2013-09-28 23:57:36 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-09-29 20:00:45 +0300 |
| commit | c231987662194d009dd91bfc57c678e0e70ca161 (patch) | |
| tree | 7bdb91e54997c60933f92bde8acb8fc716563d2e | |
| parent | 640a2427aafa774b83316b7a8c5c2bdc28bfd269 (diff) | |
| download | ffmpeg-c231987662194d009dd91bfc57c678e0e70ca161.tar.gz | |
mov: Make sure the read sample count is nonnegative
This avoids setting a negative number of frames, ending up with a
negative average frame rate.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
| -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 c3d857be4d..e1f2db28d9 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1724,6 +1724,10 @@ static int mov_read_stts(MOVContext *c, AVIOContext *pb, MOVAtom atom) sample_count=avio_rb32(pb); sample_duration = avio_rb32(pb); + if (sample_count < 0) { + av_log(c->fc, AV_LOG_ERROR, "Invalid sample_count=%d\n", sample_count); + return AVERROR_INVALIDDATA; + } sc->stts_data[i].count= sample_count; sc->stts_data[i].duration= sample_duration; |