Commit 86546109 authored by Martin Storsjö's avatar Martin Storsjö
Browse files

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: default avatarMartin Storsjö <martin@martin.st>
parent b0de1c76
...@@ -47,6 +47,7 @@ typedef struct LibRTMPContext { ...@@ -47,6 +47,7 @@ typedef struct LibRTMPContext {
char *pageurl; char *pageurl;
char *client_buffer_time; char *client_buffer_time;
int live; int live;
char *temp_filename;
} LibRTMPContext; } LibRTMPContext;
static void rtmp_log(int level, const char *fmt, va_list args) static void rtmp_log(int level, const char *fmt, va_list args)
...@@ -71,6 +72,7 @@ static int rtmp_close(URLContext *s) ...@@ -71,6 +72,7 @@ static int rtmp_close(URLContext *s)
RTMP *r = &ctx->rtmp; RTMP *r = &ctx->rtmp;
RTMP_Close(r); RTMP_Close(r);
av_freep(&ctx->temp_filename);
return 0; return 0;
} }
...@@ -149,7 +151,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) ...@@ -149,7 +151,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
len += strlen(ctx->swfurl); len += strlen(ctx->swfurl);
} }
if (!(filename = av_malloc(len))) if (!(ctx->temp_filename = filename = av_malloc(len)))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
av_strlcpy(filename, s->filename, len); av_strlcpy(filename, s->filename, len);
...@@ -229,10 +231,9 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) ...@@ -229,10 +231,9 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
} }
s->is_streamed = 1; s->is_streamed = 1;
rc = 0; return 0;
fail: fail:
if (filename != s->filename) av_freep(&ctx->temp_filename);
av_freep(&filename);
return rc; return rc;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment