Commit aeaca381 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '1c736bed'

* commit '1c736bed':
  omadec: check GEOB sizes against buffer size

Conflicts:
	libavformat/omadec.c

See: e74fa25c
See: 91e72e35Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents b1f213a8 1c736bed
...@@ -232,9 +232,8 @@ static int decrypt_init(AVFormatContext *s, ID3v2ExtraMeta *em, uint8_t *header) ...@@ -232,9 +232,8 @@ 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 AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if ( OMA_ENC_HEADER_SIZE + oc->k_size + oc->e_size + oc->i_size + 8 > 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 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;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment