summaryrefslogtreecommitdiff
path: root/libavformat/librtmp.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2014-07-04 22:13:39 +0300
committerMartin Storsjö <martin@martin.st>2014-07-06 17:49:02 +0300
commit865461099e062de5a3a109c2a5be98004c11d8bd (patch)
treef1bc9a14687b0da0ed7362846645a2c3969781d6 /libavformat/librtmp.c
parentb0de1c766329dd8c9960ad1722e2f653160abc1b (diff)
downloadffmpeg-865461099e062de5a3a109c2a5be98004c11d8bd.tar.gz
librtmp: Don't free the temp url at the end of rtmp_open
librtmp can keep pointers to this string internally, and may use them at shutdown as well. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/librtmp.c')
-rw-r--r--libavformat/librtmp.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libavformat/librtmp.c b/libavformat/librtmp.c
index aa5bd421a3..74e2c49572 100644
--- a/libavformat/librtmp.c
+++ b/libavformat/librtmp.c
@@ -47,6 +47,7 @@ typedef struct LibRTMPContext {
char *pageurl;
char *client_buffer_time;
int live;
+ char *temp_filename;
} LibRTMPContext;
static void rtmp_log(int level, const char *fmt, va_list args)
@@ -71,6 +72,7 @@ static int rtmp_close(URLContext *s)
RTMP *r = &ctx->rtmp;
RTMP_Close(r);
+ av_freep(&ctx->temp_filename);
return 0;
}
@@ -149,7 +151,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
len += strlen(ctx->swfurl);
}
- if (!(filename = av_malloc(len)))
+ if (!(ctx->temp_filename = filename = av_malloc(len)))
return AVERROR(ENOMEM);
av_strlcpy(filename, s->filename, len);
@@ -229,10 +231,9 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
}
s->is_streamed = 1;
- rc = 0;
+ return 0;
fail:
- if (filename != s->filename)
- av_freep(&filename);
+ av_freep(&ctx->temp_filename);
return rc;
}