aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2012-05-26 00:40:54 +0300
committerMartin Storsjö <martin@martin.st>2012-05-26 13:35:44 +0300
commit93cef6f923d9842b647665f3b42342fa71887a18 (patch)
tree9024d9a9428c77590c92c2d31307c4403f58203f
parent2dcb21a95d67c7d1027344abefff57b0fdaa4e33 (diff)
downloadffmpeg-93cef6f923d9842b647665f3b42342fa71887a18.tar.gz
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@martin.st>
-rw-r--r--libavformat/rtpenc_chain.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/libavformat/rtpenc_chain.c b/libavformat/rtpenc_chain.c
index 16b38d69e5..3b5ea6c586 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;
}