diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-16 13:51:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-16 13:51:40 +0200 |
| commit | e74fa25cb9f29aee8a36df0c8e492f8bafdbe4a0 (patch) | |
| tree | 7c403f20c4bd8ef0b9232527b5f9f034a1a18cbd | |
| parent | a10f71c1d65c3e457c7e42ac600efe063e432efd (diff) | |
| download | ffmpeg-e74fa25cb9f29aee8a36df0c8e492f8bafdbe4a0.tar.gz | |
omadec: check GEOB sizes against buffer size
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/omadec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/omadec.c b/libavformat/omadec.c index 4777c13048..c88d4f4d48 100644 --- a/libavformat/omadec.c +++ b/libavformat/omadec.c @@ -219,6 +219,10 @@ static int decrypt_init(AVFormatContext *s, ID3v2ExtraMeta *em, uint8_t *header) av_log(s, AV_LOG_ERROR, "Invalid encryption header\n"); return -1; } + if (oc->k_size + oc->e_size + oc->i_size > geob->datasize) { + av_log(s, AV_LOG_ERROR, "Too little GEOB data\n"); + return AVERROR_INVALIDDATA; + } oc->rid = AV_RB32(&gdata[OMA_ENC_HEADER_SIZE + 28]); av_log(s, AV_LOG_DEBUG, "RID: %.8x\n", oc->rid); |