diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-12 16:16:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-12 16:16:58 +0100 |
| commit | c693ccb89a9ed81b90901d958f8e72a7179c7242 (patch) | |
| tree | af12df8e99689719d1739ec9685d38e4ad5fd205 /libavformat | |
| parent | 7e343798976991f4320c1c90b8d4fac4c2f9e355 (diff) | |
| parent | 7b337b122959b9bf634c31b549892df974f35b40 (diff) | |
| download | ffmpeg-c693ccb89a9ed81b90901d958f8e72a7179c7242.tar.gz | |
Merge commit '7b337b122959b9bf634c31b549892df974f35b40' into release/1.1
* commit '7b337b122959b9bf634c31b549892df974f35b40':
truemotion1: make sure index does not go out of bounds
pcx: round up in bits->bytes conversion in a buffer size check
omadec: Fix wrong number of array elements
omadec: check GEOB sizes against buffer size
ac3dec: fix outptr increment.
avio: Use AVERROR_PROTOCOL_NOT_FOUND
Conflicts:
libavcodec/ac3dec.c
libavcodec/pcx.c
libavformat/omadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/omadec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/omadec.c b/libavformat/omadec.c index 50a5f955ca..5263bc4d5d 100644 --- a/libavformat/omadec.c +++ b/libavformat/omadec.c @@ -233,9 +233,8 @@ static int decrypt_init(AVFormatContext *s, ID3v2ExtraMeta *em, uint8_t *header) av_log(s, AV_LOG_ERROR, "Invalid encryption header\n"); return -1; } - if ( OMA_ENC_HEADER_SIZE + oc->k_size + oc->e_size + oc->i_size + 8 > geob->datasize - || OMA_ENC_HEADER_SIZE + 48 > 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"); return AVERROR_INVALIDDATA; } |