diff options
| author | Katerina Barone-Adesi <katerinab@gmail.com> | 2014-09-16 01:40:24 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-09-17 07:07:22 -0700 |
| commit | b45ab61b24a8f2aeafdd4451491b1b30b7875ee5 (patch) | |
| tree | 8e331d66f7117e285da9674e06dd1a439bb809e6 | |
| parent | f851477889ae48e2f17073cf7486e1d5561b7ae4 (diff) | |
| download | ffmpeg-b45ab61b24a8f2aeafdd4451491b1b30b7875ee5.tar.gz | |
apetag: Fix APE tag size check
The size variable is (correctly) unsigned, but is passed to several functions
which take signed parameters, such as avio_read, sometimes after having
numbers added to it. So ensure that size remains within the bounds that
these functions can handle.
(cherry picked from commit c5560e72d0bb69f8a1ac9536570398f84388f396)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
| -rw-r--r-- | libavformat/apetag.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/apetag.c b/libavformat/apetag.c index 22884ef6e0..bd8d0ed485 100644 --- a/libavformat/apetag.c +++ b/libavformat/apetag.c @@ -57,8 +57,10 @@ static int ape_tag_read_field(AVFormatContext *s) av_log(s, AV_LOG_WARNING, "Invalid APE tag key '%s'.\n", key); return -1; } - if (size >= UINT_MAX) - return -1; + if (size > INT32_MAX - FF_INPUT_BUFFER_PADDING_SIZE) { + av_log(s, AV_LOG_ERROR, "APE tag size too large.\n"); + return AVERROR_INVALIDDATA; + } if (flags & APE_TAG_FLAG_IS_BINARY) { uint8_t filename[1024]; enum AVCodecID id; |