diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-27 22:56:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-27 22:57:17 +0100 |
| commit | 9612dcd6b24f21b28940ef95f31335ab436b255d (patch) | |
| tree | 36ca8ac6d88960851cd8f00979eb3f431bfa5c91 | |
| parent | 76b9043e903c96a0bb9793e8809337857c66abff (diff) | |
| download | ffmpeg-9612dcd6b24f21b28940ef95f31335ab436b255d.tar.gz | |
avformat/filmstripdec: Fix several integer overflows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/filmstripdec.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavformat/filmstripdec.c b/libavformat/filmstripdec.c index 155ded2856..b76d4b7e1d 100644 --- a/libavformat/filmstripdec.c +++ b/libavformat/filmstripdec.c @@ -67,6 +67,12 @@ static int read_header(AVFormatContext *s) st->codec->width = avio_rb16(pb); st->codec->height = avio_rb16(pb); film->leading = avio_rb16(pb); + + if (st->codec->width * 4LL * st->codec->height >= INT_MAX) { + av_log(s, AV_LOG_ERROR, "dimensions too large\n"); + return AVERROR_PATCHWELCOME; + } + avpriv_set_pts_info(st, 64, 1, avio_rb16(pb)); avio_seek(pb, 0, SEEK_SET); @@ -82,7 +88,7 @@ static int read_packet(AVFormatContext *s, if (avio_feof(s->pb)) return AVERROR(EIO); - pkt->dts = avio_tell(s->pb) / (st->codec->width * (st->codec->height + film->leading) * 4); + pkt->dts = avio_tell(s->pb) / (st->codec->width * (int64_t)(st->codec->height + film->leading) * 4); pkt->size = av_get_packet(s->pb, pkt, st->codec->width * st->codec->height * 4); avio_skip(s->pb, st->codec->width * (int64_t) film->leading * 4); if (pkt->size < 0) |