RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-31 20:02:07 +00:00
Code Issues Projects Releases Wiki Activity

omadec: Check geob datasize more completely

Browse Source 
Fixes out of heap array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-05-10 17:22:27 +02:00
parent eee89f691e
commit 91e72e3514
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/omadec.c
View File

@ -219,7 +219,9 @@ static int decrypt_init(AVFormatContext *s, ID3v2ExtraMeta *em, uint8_t *header)
av_log(s, AV_LOG_ERROR, "Invalid encryption header\n"); av_log(s, AV_LOG_ERROR, "Invalid encryption header\n");
return -1; return -1;
} }
if (oc->k_size + oc->e_size + oc->i_size > geob->datasize) { if ( OMA_ENC_HEADER_SIZE + oc->k_size + oc->e_size + oc->i_size + 8 > geob->datasize
|| OMA_ENC_HEADER_SIZE + 48 > geob->datasize
) {
av_log(s, AV_LOG_ERROR, "Too little GEOB data\n"); av_log(s, AV_LOG_ERROR, "Too little GEOB data\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }