diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 07:12:43 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 07:12:43 +0400 |
| commit | f4489c9558c983dcf0e00e9a706f1e5cc653e9e3 (patch) | |
| tree | 83515bc7bad4ecd762cac805598c2a01ee6183ca /libavformat | |
| parent | 0e5d9fe2a7f4d8704b39e3e9994b8ec1804a093c (diff) | |
| parent | b5210f4eae30df587815b5f005f219aa723591d3 (diff) | |
Merge commit 'b5210f4eae30df587815b5f005f219aa723591d3' into release/2.2
* commit 'b5210f4eae30df587815b5f005f219aa723591d3':
http: Properly initialize icy headers string
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/http.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index 8c16d83348..a78de945b0 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -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) { int len = 4 + strlen(p) + strlen(tag); + int is_first = !s->icy_metadata_headers; int ret; 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) return ret; + if (is_first) + *s->icy_metadata_headers = '\0'; + av_strlcatf(s->icy_metadata_headers, len, "%s: %s\n", tag, p); return 0; |