Skip to content

Fixed: Empty file crash during analysis #1407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daschuer merged 3 commits into from
Dec 11, 2017
Merged

Fixed: Empty file crash during analysis #1407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62ccd7f
Fix analyzer crash with empty file
uklotzde Dec 11, 2017
728bcf5
Add a test for opening empty audio files
uklotzde Dec 11, 2017
2a1c3ca
Fix unused parameters
uklotzde Dec 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/analyzer/analyzerqueue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,8 +349,7 @@ void AnalyzerQueue::execThread() {
if (!pAudioSource) {
kLogger.warning()
<< "Failed to open file for analyzing:"
<< nextTrack->getLocation()
<< *pAudioSource;
<< nextTrack->getLocation();
emptyCheck();
continue;
}
Expand Down
22 changes: 20 additions & 2 deletions src/test/soundproxy_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <QTemporaryFile>
#include <QtDebug>

#include "test/mixxxtest.h"
Expand Down Expand Up @@ -74,7 +75,7 @@ class SoundSourceProxyTest: public MixxxTest {
// to test the upscaling of channels
mixxx::AudioSource::OpenParams openParams;
openParams.setChannelCount(2);
auto pAudioSource = proxy.openAudioSource();
auto pAudioSource = proxy.openAudioSource(openParams);
EXPECT_FALSE(!pAudioSource);
if (pAudioSource->channelCount() != 2) {
// Wrap into proxy object
Expand Down Expand Up @@ -157,7 +158,7 @@ TEST_F(SoundSourceProxyTest, open) {
for (const auto& filePath: getFilePaths()) {
ASSERT_TRUE(SoundSourceProxy::isFileNameSupported(filePath));

mixxx::AudioSourcePointer pAudioSource(openAudioSource(filePath));
mixxx::AudioSourcePointer pAudioSource = openAudioSource(filePath);
// Obtaining an AudioSource may fail for unsupported file formats,
// even if the corresponding file extension is supported, e.g.
// AAC vs. ALAC in .m4a files
Expand All @@ -171,6 +172,23 @@ TEST_F(SoundSourceProxyTest, open) {
}
}

TEST_F(SoundSourceProxyTest, openEmptyFile) {
for (const auto& fileNameSuffix: getFileNameSuffixes()) {
QTemporaryFile tempFile("emptyXXXXXX" + fileNameSuffix);
qDebug() << "Created testing to open empty file:"
<< tempFile.fileName();
tempFile.open();
tempFile.close();

ASSERT_TRUE(SoundSourceProxy::isFileNameSupported(tempFile.fileName()));
auto pTrack = Track::newTemporary(tempFile.fileName());
SoundSourceProxy proxy(pTrack);

auto pAudioSource = proxy.openAudioSource();
EXPECT_TRUE(!pAudioSource);
}
}

TEST_F(SoundSourceProxyTest, readArtist) {
auto pTrack = Track::newTemporary(
kTestDir.absoluteFilePath("artist.mp3"));
Expand Down