FormatContext: fix memory leak when adding new streams to an OutputFile

Clement Champetier · Clement Champetier · commit ccdbbeaf48fb · 2016-10-31T11:06:10.000+01:00
See the ffmpeg/libav documentation of avformat_new_stream function: https://www.ffmpeg.org/doxygen/2.7/group__lavf__core.html#gadcb0fd3e507d9b58fe78f61f8ad39827
diff --git a/src/AvTranscoder/file/FormatContext.cpp b/src/AvTranscoder/file/FormatContext.cpp
@@ -8,6 +8,7 @@ namespace avtranscoder
 
 FormatContext::FormatContext(const std::string& filename, int req_flags, AVDictionary** options)
     : _avFormatContext(NULL)
+    , _avStreamAllocated()
     , _flags(req_flags)
     , _options()
     , _isOpen(false)
@@ -31,6 +32,7 @@ FormatContext::FormatContext(const std::string& filename, int req_flags, AVDicti
 
 FormatContext::FormatContext(int req_flags)
     : _avFormatContext(NULL)
+    , _avStreamAllocated()
     , _flags(req_flags)
     , _options()
     , _isOpen(false)
@@ -45,8 +47,8 @@ FormatContext::~FormatContext()
         return;
 
     // free the streams added
-    for(unsigned int i = 0; i < _avFormatContext->nb_streams; ++i)
-        avcodec_close(_avFormatContext->streams[i]->codec);
+    for(std::vector<AVStream*>::iterator it = _avStreamAllocated.begin(); it != _avStreamAllocated.end(); ++it)
+        avcodec_close((*it)->codec);
 
     // free the format context
     if(_isOpen)
@@ -143,6 +145,7 @@ AVStream& FormatContext::addAVStream(const AVCodec& avCodec)
     {
         throw std::runtime_error("Unable to add new video stream");
     }
+    _avStreamAllocated.push_back(stream);
     return *stream;
 }
 
diff --git a/src/AvTranscoder/file/FormatContext.hpp b/src/AvTranscoder/file/FormatContext.hpp
@@ -122,6 +122,7 @@ class AvExport FormatContext
 
 private:
     AVFormatContext* _avFormatContext; ///< Has ownership
+    std::vector<AVStream*> _avStreamAllocated; ///< Has link (no ownership)
     const int _flags;                  ///< Flags with which the options are loaded (see AV_OPT_FLAG_xxx)
     OptionMap _options;
     bool _isOpen; ///< Is the AVFormatContext open (in constructor with a filename)
