Skip to content

M
mpd
Commit fe4b1f96 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

SongLoader: use temporary stack variable, no heap allocation

Improved exception-safety.
parent 9de984f7
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
src/SongLoader.cxx
View file @ fe4b1f96
...@@ -65,15 +65,14 @@ SongLoader::LoadFile(const char *path_utf8, Path path_fs, Error &error) const ...@@ -65,15 +65,14 @@ SongLoader::LoadFile(const char *path_utf8, Path path_fs, Error &error) const
} }
#endif #endif
DetachedSong *song = new DetachedSong(path_utf8); DetachedSong song(path_utf8);
if (!song->LoadFile(path_fs)) { if (!song.LoadFile(path_fs)) {
error.Set(playlist_domain, int(PlaylistResult::NO_SUCH_SONG), error.Set(playlist_domain, int(PlaylistResult::NO_SUCH_SONG),
"No such file"); "No such file");
delete song;
return nullptr; return nullptr;
} }
return song; return new DetachedSong(std::move(song));
} }
DetachedSong * DetachedSong *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment