Fix tiny memory leak if any of the decoder or demuxer options are set…

… and opening a file fails
vapoursynth · Sep 21, 2024 · 72c6787 · 72c6787
1 parent 16fdf3e
commit 72c6787
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/audiosource.cpp b/src/audiosource.cpp
@@ -77,8 +77,10 @@ void LWAudioDecoder::OpenFile(const std::filesystem::path &SourceFile, int Track
     for (const auto &Iter : LAVFOpts)
         av_dict_set(&Dict, Iter.first.c_str(), Iter.second.c_str(), 0);
 
-    if (avformat_open_input(&FormatContext, SourceFile.u8string().c_str(), nullptr, &Dict) != 0)
+    if (avformat_open_input(&FormatContext, SourceFile.u8string().c_str(), nullptr, &Dict) != 0) {
+        av_dict_free(&Dict);
         throw BestSourceException("Couldn't open '" + SourceFile.u8string() + "'");
+    }
 
     av_dict_free(&Dict);
 

diff --git a/src/tracklist.cpp b/src/tracklist.cpp
@@ -20,6 +20,7 @@
 
 #include "tracklist.h"
 #include <cassert>
+#include <memory>
 
 extern "C" {
 #include <libavformat/avformat.h>
@@ -31,8 +32,10 @@ void BestTrackList::OpenFile(const std::filesystem::path &SourceFile, const std:
     for (const auto &Iter : LAVFOpts)
         av_dict_set(&Dict, Iter.first.c_str(), Iter.second.c_str(), 0);
 
-    if (avformat_open_input(&FormatContext, SourceFile.u8string().c_str(), nullptr, &Dict) != 0)
+    if (avformat_open_input(&FormatContext, SourceFile.u8string().c_str(), nullptr, &Dict) != 0) {
+        av_dict_free(&Dict);
         throw BestSourceException("Couldn't open '" + SourceFile.u8string() + "'");
+    }
 
     av_dict_free(&Dict);
 

diff --git a/src/videosource.cpp b/src/videosource.cpp
@@ -131,8 +131,10 @@ void LWVideoDecoder::OpenFile(const std::filesystem::path &SourceFile, const std
     for (const auto &Iter : LAVFOpts)
         av_dict_set(&Dict, Iter.first.c_str(), Iter.second.c_str(), 0);
 
-    if (avformat_open_input(&FormatContext, SourceFile.u8string().c_str(), nullptr, &Dict) != 0)
+    if (avformat_open_input(&FormatContext, SourceFile.u8string().c_str(), nullptr, &Dict) != 0) {
+        av_dict_free(&Dict);
         throw BestSourceException("Couldn't open '" + SourceFile.u8string() + "'");
+    }
 
     av_dict_free(&Dict);