[FFmpeg-cvslog] avformat/matroskaenc: fix leak on error

Tristan Matthews git at videolan.org
Tue Apr 9 18:12:51 EEST 2019


ffmpeg | branch: release/4.1 | Tristan Matthews <tmatth at videolan.org> | Thu Apr  4 12:56:26 2019 -0400| [cf7a5c655c04cd7d1a8912f390a7ae971ecf447b] | committer: James Almer

avformat/matroskaenc: fix leak on error

Signed-off-by: James Almer <jamrial at gmail.com>
(cherry picked from commit 1ec777dcdd03b43d3d694c3b4532dccea0b419f0)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf7a5c655c04cd7d1a8912f390a7ae971ecf447b
---

 libavformat/matroskaenc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index aed83aef70..ff1cba0145 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -694,8 +694,10 @@ static int put_flac_codecpriv(AVFormatContext *s,
         av_dict_set(&dict, "WAVEFORMATEXTENSIBLE_CHANNEL_MASK", buf, 0);
 
         len = ff_vorbiscomment_length(dict, vendor);
-        if (len >= ((1<<24) - 4))
+        if (len >= ((1<<24) - 4)) {
+            av_dict_free(&dict);
             return AVERROR(EINVAL);
+        }
 
         data = av_malloc(len + 4);
         if (!data) {



More information about the ffmpeg-cvslog mailing list