[FFmpeg-cvslog] avformat/fifo: Free dict on av_dict_copy() failure

Andreas Rheinhardt git at videolan.org
Sat Aug 7 00:02:11 EEST 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Wed Jul 28 23:23:05 2021 +0200| [9f19fbba4a84ddff73e32bfe13f0702a4bb40652] | committer: Andreas Rheinhardt

avformat/fifo: Free dict on av_dict_copy() failure

av_dict_copy() puts the onus on the caller to clean up dst on failure;
it can be nonempty if copying a later entry of src fails after having
successfully copied an earlier entry.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

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

 libavformat/fifo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/fifo.c b/libavformat/fifo.c
index a9b59b6589..10511167cd 100644
--- a/libavformat/fifo.c
+++ b/libavformat/fifo.c
@@ -129,7 +129,7 @@ static int fifo_thread_write_header(FifoThreadContext *ctx)
 
     ret = av_dict_copy(&format_options, fifo->format_options, 0);
     if (ret < 0)
-        return ret;
+        goto end;
 
     ret = ff_format_output_open(avf2, avf->url, &format_options);
     if (ret < 0) {



More information about the ffmpeg-cvslog mailing list