Merge commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8'

[ffmpeg] / libavformat / apetag.c

diff --git a/libavformat/apetag.c b/libavformat/apetag.c
index bf9918a0b383c725571d01d4613cdf8b427ac518..a445c84aef3b523209d7a67e691a119c37bdbca4 100644 (file)
--- 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) {