decoder/mpg123: use AtScopeExit() to call mpg123_delete() during scan

1 files changed, 2 insertions, 5 deletions

diff --git a/src/decoder/plugins/Mpg123DecoderPlugin.cxx b/src/decoder/plugins/Mpg123DecoderPlugin.cxx
index de002f29a..7b7af4a6f 100644
--- a/src/decoder/plugins/Mpg123DecoderPlugin.cxx
+++ b/src/decoder/plugins/Mpg123DecoderPlugin.cxx
@@ -287,20 +287,19 @@ mpd_mpg123_scan_file(Path path_fs, TagHandler &handler) noexcept
 		return false;
 	}
 
+	AtScopeExit(handle) { mpg123_delete(handle); };
+
 	AudioFormat audio_format;
 	try {
 		if (!mpd_mpg123_open(handle, path_fs.c_str(), audio_format)) {
-			mpg123_delete(handle);
 			return false;
 		}
 	} catch (...) {
-		mpg123_delete(handle);
 		return false;
 	}
 
 	const off_t num_samples = mpg123_length(handle);
 	if (num_samples <= 0) {
-		mpg123_delete(handle);
 		return false;
 	}
 
@@ -308,8 +307,6 @@ mpd_mpg123_scan_file(Path path_fs, TagHandler &handler) noexcept
 
 	/* ID3 tag support not yet implemented */
 
-	mpg123_delete(handle);
-
 	const auto duration =
 		SongTime::FromScale<uint64_t>(num_samples,
 					      audio_format.sample_rate);