From fde99fa2fbd4ead7c682f08346a298b93448836c Mon Sep 17 00:00:00 2001 From: Tsuda Kageyu Date: Mon, 16 Sep 2013 04:56:33 +0900 Subject: [PATCH 1/2] Suppressed a useless debug message in aiffproperties.cpp --- taglib/riff/aiff/aiffproperties.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/taglib/riff/aiff/aiffproperties.cpp b/taglib/riff/aiff/aiffproperties.cpp index 6d103e83..9815800a 100644 --- a/taglib/riff/aiff/aiffproperties.cpp +++ b/taglib/riff/aiff/aiffproperties.cpp @@ -136,6 +136,9 @@ void RIFF::AIFF::AudioProperties::read(const ByteVector &data) d->bitrate = static_cast((sampleRate * d->sampleWidth * d->channels) / 1000.0); d->length = d->sampleRate > 0 ? d->sampleFrames / d->sampleRate : 0; + if(data.size() == 18) + return; + if(data.size() < 23) { debug("RIFF::AIFF::AudioProperties::read() - \"COMM\" chunk is too short for AIFF-C."); return; From b7ffa04f206b4aeaa65a4a16d737779831d9d813 Mon Sep 17 00:00:00 2001 From: Tsuda Kageyu Date: Mon, 16 Sep 2013 21:54:12 +0900 Subject: [PATCH 2/2] Simplified the check for AIFF-C format --- taglib/riff/aiff/aiffproperties.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/taglib/riff/aiff/aiffproperties.cpp b/taglib/riff/aiff/aiffproperties.cpp index 9815800a..25012ecd 100644 --- a/taglib/riff/aiff/aiffproperties.cpp +++ b/taglib/riff/aiff/aiffproperties.cpp @@ -136,14 +136,8 @@ void RIFF::AIFF::AudioProperties::read(const ByteVector &data) d->bitrate = static_cast((sampleRate * d->sampleWidth * d->channels) / 1000.0); d->length = d->sampleRate > 0 ? d->sampleFrames / d->sampleRate : 0; - if(data.size() == 18) - return; - - if(data.size() < 23) { - debug("RIFF::AIFF::AudioProperties::read() - \"COMM\" chunk is too short for AIFF-C."); - return; + if(data.size() >= 23) { + d->compressionType = data.mid(18, 4); + d->compressionName = String(data.mid(23, static_cast(data[22]))); } - - d->compressionType = data.mid(18, 4); - d->compressionName = String(data.mid(23, static_cast(data[22]))); }