decoder/ffmpeg: add missing nullptr checks

Fixes part 1 of https://github.com/MusicPlayerDaemon/MPD/issues/1490

decoder/ffmpeg: add missing nullptr checks
f2a3dfd7 · Max Kellermann · 85f9863e · f2a3dfd7
Commit f2a3dfd7 authored Apr 26, 2022 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

FfmpegDecoderPlugin.cxx src/decoder/plugins/FfmpegDecoderPlugin.cxx +3 -0

No files found.
--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
@@ -384,6 +384,7 @@ static void
 FfmpegParseMetaData(const AVStream &stream,
 		    ReplayGainInfo &rg, MixRampInfo &mr)
 {
+	if (stream.metadata != nullptr)
 		FfmpegParseMetaData(*stream.metadata, rg, mr);
 }

@@ -393,7 +394,9 @@ FfmpegParseMetaData(const AVFormatContext &format_context, int audio_stream,
 {
 	assert(audio_stream >= 0);

+	if (format_context.metadata != nullptr)
 		FfmpegParseMetaData(*format_context.metadata, rg, mr);
+
 	FfmpegParseMetaData(*format_context.streams[audio_stream],
 				    rg, mr);
 }