diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-05-04 16:06:26 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2012-05-04 16:06:26 -0700 |
| commit | 273e6af47b38391f2bcc157cca0423fe7fcbf55c (patch) | |
| tree | d80fb1e67241e13b5053d2b2130b4ac6ef88fca9 /libavformat/electronicarts.c | |
| parent | 37ddd3833219fa7b913fff3f5cccc6878b047e6b (diff) | |
| download | ffmpeg-273e6af47b38391f2bcc157cca0423fe7fcbf55c.tar.gz | |
ea: check chunk_size for validity.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Diffstat (limited to 'libavformat/electronicarts.c')
| -rw-r--r-- | libavformat/electronicarts.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c index 47ef40f69d..b215547f33 100644 --- a/libavformat/electronicarts.c +++ b/libavformat/electronicarts.c @@ -487,12 +487,17 @@ static int ea_read_packet(AVFormatContext *s, while (!packet_read) { chunk_type = avio_rl32(pb); - chunk_size = (ea->big_endian ? avio_rb32(pb) : avio_rl32(pb)) - 8; + chunk_size = ea->big_endian ? avio_rb32(pb) : avio_rl32(pb); + if (chunk_size <= 8) + return AVERROR_INVALIDDATA; + chunk_size -= 8; switch (chunk_type) { /* audio data */ case ISNh_TAG: /* header chunk also contains data; skip over the header portion*/ + if (chunk_size < 32) + return AVERROR_INVALIDDATA; avio_skip(pb, 32); chunk_size -= 32; case ISNd_TAG: |