[FFmpeg-cvslog] rtpenc_chain: Free the URLContext on failure

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Sat May 26 00:40:54 2012 +0300| [93cef6f923d9842b647665f3b42342fa71887a18] | committer: Martin Storsjö

rtpenc_chain: Free the URLContext on failure

If an URLContext is passed in, its ownership is given to this
function, and is either owned by the returned AVFormatContext
on a successful return, or freed on failure.

Signed-off-by: Martin Storsjö <martin at martin.st>

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

 libavformat/rtpenc_chain.c |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/libavformat/rtpenc_chain.c b/libavformat/rtpenc_chain.c
index 16b38d6..3b5ea6c 100644
--- a/libavformat/rtpenc_chain.c
+++ b/libavformat/rtpenc_chain.c
@@ -28,25 +28,23 @@
 AVFormatContext *ff_rtp_chain_mux_open(AVFormatContext *s, AVStream *st,
                                        URLContext *handle, int packet_size)
 {
-    AVFormatContext *rtpctx;
+    AVFormatContext *rtpctx = NULL;
     int ret;
     AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL);
     uint8_t *rtpflags;
     AVDictionary *opts = NULL;
 
     if (!rtp_format)
-        return NULL;
+        goto fail;
 
     /* Allocate an AVFormatContext for each output stream */
     rtpctx = avformat_alloc_context();
     if (!rtpctx)
-        return NULL;
+        goto fail;
 
     rtpctx->oformat = rtp_format;
-    if (!avformat_new_stream(rtpctx, NULL)) {
-        av_free(rtpctx);
-        return NULL;
-    }
+    if (!avformat_new_stream(rtpctx, NULL))
+        goto fail;
     /* Pass the interrupt callback on */
     rtpctx->interrupt_callback = s->interrupt_callback;
     /* Copy the max delay setting; the rtp muxer reads this. */
@@ -82,4 +80,10 @@ AVFormatContext *ff_rtp_chain_mux_open(AVFormatContext *s, AVStream *st,
     }
 
     return rtpctx;
+
+fail:
+    av_free(rtpctx);
+    if (handle)
+        ffurl_close(handle);
+    return NULL;
 }