aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2013-08-13 07:40:38 +0200
committerSean McGovern <gseanmcg@gmail.com>2013-09-23 19:41:09 -0400
commit896baaaad85c402db187c1c81ececc3a9624dbc1 (patch)
treea4e33fcfcba09010f779d661281440bbb8531f46
parent15620c153a35f76191c1e476fc9df24fbfd54e10 (diff)
downloadffmpeg-896baaaad85c402db187c1c81ececc3a9624dbc1.tar.gz
segafilm: Error out on impossible packet size
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 5268bd2900effa59b51e0fede61aacde5e2f0b95) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
-rw-r--r--libavformat/segafilm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c
index 5c346a75bb..5279121383 100644
--- a/libavformat/segafilm.c
+++ b/libavformat/segafilm.c
@@ -210,6 +210,8 @@ static int film_read_header(AVFormatContext *s,
film->sample_table[i].sample_offset =
data_offset + AV_RB32(&scratch[0]);
film->sample_table[i].sample_size = AV_RB32(&scratch[4]);
+ if (film->sample_table[i].sample_size > INT_MAX / 4)
+ return AVERROR_INVALIDDATA;
if (AV_RB32(&scratch[8]) == 0xFFFFFFFF) {
film->sample_table[i].stream = film->audio_stream_index;
film->sample_table[i].pts = audio_frame_counter;