generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apetag: Fix APE tag size check

Browse Source 
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 c5560e72d0)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Katerina Barone-Adesi
2014-09-16 01:40:24 +02:00
committed by Diego Biurrun
parent f851477889
commit b45ab61b24
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/apetag.c
View File

@@ -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); av_log(s, AV_LOG_WARNING, "Invalid APE tag key '%s'.\n", key);
return -1; return -1;
} }
if (size >= UINT_MAX) if (size > INT32_MAX - FF_INPUT_BUFFER_PADDING_SIZE) {
return -1; av_log(s, AV_LOG_ERROR, "APE tag size too large.\n");
return AVERROR_INVALIDDATA;
}
if (flags & APE_TAG_FLAG_IS_BINARY) { if (flags & APE_TAG_FLAG_IS_BINARY) {
uint8_t filename[1024]; uint8_t filename[1024];
enum AVCodecID id; enum AVCodecID id;