highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'b5210f4eae30df587815b5f005f219aa723591d3' into release/2.2

Browse Source 
* commit 'b5210f4eae30df587815b5f005f219aa723591d3':
  http: Properly initialize icy headers string

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-16 04:12:43 +01:00
parent 0e5d9fe2a7 b5210f4eae
commit f4489c9558
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/http.c
View File

@ -410,6 +410,7 @@ static int parse_content_encoding(URLContext *h, const char *p)
static int parse_icy(HTTPContext *s, const char *tag, const char *p) static int parse_icy(HTTPContext *s, const char *tag, const char *p)
{ {
int len = 4 + strlen(p) + strlen(tag); int len = 4 + strlen(p) + strlen(tag);
int is_first = !s->icy_metadata_headers;
int ret; int ret;
if (s->icy_metadata_headers) if (s->icy_metadata_headers)
@ -418,6 +419,9 @@ static int parse_icy(HTTPContext *s, const char *tag, const char *p)
if ((ret = av_reallocp(&s->icy_metadata_headers, len)) < 0) if ((ret = av_reallocp(&s->icy_metadata_headers, len)) < 0)
return ret; return ret;
if (is_first)
*s->icy_metadata_headers = '\0';
av_strlcatf(s->icy_metadata_headers, len, "%s: %s\n", tag, p); av_strlcatf(s->icy_metadata_headers, len, "%s: %s\n", tag, p);
return 0; return 0;