diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-22 15:36:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-22 15:36:50 +0100 |
| commit | a9cfbf6d4b08a8b4ceb610f08f1cc232b090ba8f (patch) | |
| tree | d5d3080338172b270439e283e8b96c07fbe3ad56 /libavformat/apetag.c | |
| parent | c8a5365dcf14e930d1fd06bf10662aae78182da4 (diff) | |
| parent | 9ae80e6a9cefcab61e867256ba19ef78a4bfe0cb (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
id3v2: fix reading unsynchronized frames.
cdgraphics: fix incorrect vertical offset mask in cdg_scroll()
apetag: fix error handling in ff_ape_parse_tag()
Conflicts:
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/apetag.c')
| -rw-r--r-- | libavformat/apetag.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/apetag.c b/libavformat/apetag.c index bf9918a0b3..a445c84aef 100644 --- a/libavformat/apetag.c +++ b/libavformat/apetag.c @@ -142,11 +142,11 @@ int64_t ff_ape_parse_tag(AVFormatContext *s) return 0; } - tag_start = file_size - tag_bytes - APE_TAG_FOOTER_BYTES; - if (tag_start < 0) { + if (tag_bytes > file_size - APE_TAG_FOOTER_BYTES) { av_log(s, AV_LOG_ERROR, "Invalid tag size %u.\n", tag_bytes); return 0; } + tag_start = file_size - tag_bytes - APE_TAG_FOOTER_BYTES; fields = avio_rl32(pb); /* number of fields */ if (fields > 65536) { |