SongLoader: use temporary stack variable, no heap allocation

Improved exception-safety.

SongLoader: use temporary stack variable, no heap allocation
fe4b1f96 · Max Kellermann · 9de984f7 · fe4b1f96
Commit fe4b1f96 authored Feb 28, 2016 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

SongLoader.cxx src/SongLoader.cxx +3 -4

No files found.
--- a/src/SongLoader.cxx
+++ b/src/SongLoader.cxx
@@ -65,15 +65,14 @@ SongLoader::LoadFile(const char *path_utf8, Path path_fs, Error &error) const
 	}
 #endif

-	DetachedSong *song = new DetachedSong(path_utf8);
-	if (!song->LoadFile(path_fs)) {
+	DetachedSong song(path_utf8);
+	if (!song.LoadFile(path_fs)) {
 		error.Set(playlist_domain, int(PlaylistResult::NO_SUCH_SONG),
 			  "No such file");
-		delete song;
 		return nullptr;
 	}

-	return song;
+	return new DetachedSong(std::move(song));
 }

 DetachedSong *