dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check that QIODevice::open() is successful, and explicitly call close()

Browse Source
This commit is contained in:
Jonas Kvinge
2021-07-14 20:52:57 +02:00
parent f64c1dd9e5
commit 2eab763d74
15 changed files with 74 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/songloader.cpp
View File

@@ -358,10 +358,13 @@ void SongLoader::EffectiveSongLoad(Song *song) {
}
void SongLoader::LoadPlaylist(ParserBase *parser, const QString &filename) {
QFile file(filename);
file.open(QIODevice::ReadOnly);
songs_ = parser->Load(&file, filename, QFileInfo(filename).path());
file.close();
if (file.open(QIODevice::ReadOnly)) {
songs_ = parser->Load(&file, filename, QFileInfo(filename).path());
file.close();
}
}
static bool CompareSongs(const Song &left, const Song &right) {
@@ -429,9 +432,10 @@ void SongLoader::StopTypefind() {
// Parse the playlist
QBuffer buf(&buffer_);
buf.open(QIODevice::ReadOnly);
songs_ = parser_->Load(&buf);
buf.close();
if (buf.open(QIODevice::ReadOnly)) {
songs_ = parser_->Load(&buf);
buf.close();
}
}
else if (success_) {