Martchus
/
tagparser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't emit warning about zero-bytes for designated padding

This commit is contained in:
Martchus 2020-11-26 23:11:22 +01:00
parent 5f39e377dc
commit 214c8eecb3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mediafileinfo.cpp
View File

@ -162,6 +162,7 @@ void MediaFileInfo::parseContainerFormat(Diagnostics &diag)
// file size // file size
m_paddingSize = 0; m_paddingSize = 0;
m_containerOffset = 0; m_containerOffset = 0;
size_t bytesSkippedBeforeContainer = 0;
// read signatrue // read signatrue
char buff[16]; char buff[16];
@ -179,9 +180,10 @@ startParsingSignature:
if (bytesSkipped >= 4) { if (bytesSkipped >= 4) {
skipZeroBytes: skipZeroBytes:
m_containerOffset += bytesSkipped; m_containerOffset += bytesSkipped;
m_paddingSize += bytesSkipped;
// give up after 0x100 bytes // give up after 0x100 bytes
if ((m_paddingSize += bytesSkipped) >= 0x800u) { if ((bytesSkippedBeforeContainer += bytesSkipped) >= 0x800u) {
m_containerParsingStatus = ParsingStatus::NotSupported; m_containerParsingStatus = ParsingStatus::NotSupported;
m_containerFormat = ContainerFormat::Unknown; m_containerFormat = ContainerFormat::Unknown;
return; return;
@ -272,9 +274,9 @@ startParsingSignature:
} }
} }
if (m_paddingSize) { if (bytesSkippedBeforeContainer) {
diag.emplace_back(DiagLevel::Warning, diag.emplace_back(DiagLevel::Warning,
argsToString(m_paddingSize, argsToString(bytesSkippedBeforeContainer,
m_id3v2Tags.empty() ? " zero-bytes skipped at the beginning of the file." : " zero-bytes skipped after the ID3v2 tag."), m_id3v2Tags.empty() ? " zero-bytes skipped at the beginning of the file." : " zero-bytes skipped after the ID3v2 tag."),
context); context);
} }