From 62572435d4106098c090fb8f129a9090e41ff1eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Wed, 7 Aug 2013 10:20:07 +0300
Subject: [PATCH] rtpenc_chain: Check for errors from ffio_fdopen and
ffio_open_dyn_packet_buf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Martin Storsjö <martin@martin.st>
---
libavformat/rtpenc_chain.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/libavformat/rtpenc_chain.c b/libavformat/rtpenc_chain.c
index 935dd6cd31..10c4020cfe 100644
--- a/libavformat/rtpenc_chain.c
+++ b/libavformat/rtpenc_chain.c
@@ -75,16 +75,19 @@ int ff_rtp_chain_mux_open(AVFormatContext **out, AVFormatContext *s,
avcodec_copy_context(rtpctx->streams[0]->codec, st->codec);
if (handle) {
- ffio_fdopen(&rtpctx->pb, handle);
+ ret = ffio_fdopen(&rtpctx->pb, handle);
+ if (ret < 0)
+ ffurl_close(handle);
} else
- ffio_open_dyn_packet_buf(&rtpctx->pb, packet_size);
- ret = avformat_write_header(rtpctx, &opts);
+ ret = ffio_open_dyn_packet_buf(&rtpctx->pb, packet_size);
+ if (!ret)
+ ret = avformat_write_header(rtpctx, &opts);
av_dict_free(&opts);
if (ret) {
- if (handle) {
+ if (handle && rtpctx->pb) {
avio_close(rtpctx->pb);
- } else {
+ } else if (rtpctx->pb) {
uint8_t *ptr;
avio_close_dyn_buf(rtpctx->pb, &ptr);
av_free(ptr);