Browse Source

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>
tags/n2.3
Martin Storsjö 11 years ago
parent
commit
865461099e
1 changed files with 5 additions and 4 deletions
  1. +5
    -4
      libavformat/librtmp.c

+ 5
- 4
libavformat/librtmp.c View File

@@ -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;
}



Loading…
Cancel
Save