From a224722ae2f662e1b8171087e8e9ae680af5827c Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 22 Feb 2016 12:33:55 +0100 Subject: [PATCH] tag/Id3Load: add constant ID3V1_SIZE --- src/tag/Id3Load.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/tag/Id3Load.cxx b/src/tag/Id3Load.cxx index f637339f8..95769084c 100644 --- a/src/tag/Id3Load.cxx +++ b/src/tag/Id3Load.cxx @@ -36,6 +36,8 @@ static constexpr Domain id3_domain("id3"); +static constexpr size_t ID3V1_SIZE = 128; + gcc_pure static inline bool tag_is_id3v1(struct id3_tag *tag) @@ -137,10 +139,10 @@ static UniqueId3Tag tag_id3_find_from_end(FILE *stream) { /* Get an id3v1 tag from the end of file for later use */ - auto v1tag = tag_id3_read(stream, -128, SEEK_END); + auto v1tag = tag_id3_read(stream, -(off_t)ID3V1_SIZE, SEEK_END); /* Get the id3v2 tag size from the footer (located before v1tag) */ - int tagsize = get_id3v2_footer_size(stream, (v1tag ? -128 : 0) - ID3_TAG_QUERYSIZE, SEEK_END); + int tagsize = get_id3v2_footer_size(stream, (v1tag ? -(off_t)ID3V1_SIZE : 0) - ID3_TAG_QUERYSIZE, SEEK_END); if (tagsize >= 0) return v1tag;