MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-29 00:23:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rework pr #162 to avoid mem leaks and string termination problems

Browse Source
This commit is contained in:
ejurgensen 2015-06-05 23:55:57 +02:00
parent 7d231b992b
commit a9437acc1a
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/http.c
View File

@ -22,6 +22,7 @@
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <uniconv.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
@ -64,15 +65,21 @@ static void
headers_save(struct keyval *kv, struct evkeyvalq *headers) headers_save(struct keyval *kv, struct evkeyvalq *headers)
{ {
const char *value; const char *value;
uint8_t *utf;
int i; int i;
if (!kv || !headers) if (!kv || !headers)
return; return;
for (i = 0; i < (sizeof(header_list) / sizeof(header_list[0])); i++) for (i = 0; i < (sizeof(header_list) / sizeof(header_list[0])); i++)
{
if ( (value = evhttp_find_header(headers, header_list[i])) ) if ( (value = evhttp_find_header(headers, header_list[i])) )
keyval_add(kv, header_list[i], value); {
utf = u8_strconv_from_encoding(value, "ISO−8859−1", iconveh_question_mark);
if (!utf)
continue;
keyval_add(kv, header_list[i], (char *)utf);
free(utf);
} }
} }
@ -406,15 +413,23 @@ static int
metadata_header_get(struct http_icy_metadata *metadata, AVFormatContext *fmtctx) metadata_header_get(struct http_icy_metadata *metadata, AVFormatContext *fmtctx)
{ {
uint8_t *buffer; uint8_t *buffer;
uint8_t *utf;
char *icy_token; char *icy_token;
char *ptr; char *ptr;
const char *headerenc = "ISO−8859−1";
av_opt_get(fmtctx, "icy_metadata_headers", AV_OPT_SEARCH_CHILDREN, &buffer); av_opt_get(fmtctx, "icy_metadata_headers", AV_OPT_SEARCH_CHILDREN, &buffer);
if (!buffer) if (!buffer)
return -1; return -1;
icy_token = strtok((char *)buffer, "\r\n"); /* Headers are ascii or iso-8859-1 according to:
* http://www.w3.org/Protocols/rfc2616/rfc2616-sec2.html#sec2.2
*/
utf = u8_strconv_from_encoding((char *)buffer, "ISO−8859−1", iconveh_question_mark);
av_free(buffer);
if (!utf)
return -1;
icy_token = strtok((char *)utf, "\r\n");
while (icy_token != NULL) while (icy_token != NULL)
{ {
ptr = strchr(icy_token, ':'); ptr = strchr(icy_token, ':');
@ -428,31 +443,16 @@ metadata_header_get(struct http_icy_metadata *metadata, AVFormatContext *fmtctx)
if (ptr[0] == ' ') if (ptr[0] == ' ')
ptr++; ptr++;
/*
Reference:
http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.2
http://www.w3.org/Protocols/rfc2616/rfc2616-sec2.html#sec2.2
Based on rfc2616 the field-content is defined as follows: <the OCTETs making up the field-value
and consisting of either *TEXT or combinations of token, separators, and quoted-string>
The TEXT rule is only used for descriptive field contents and values that are not intended to be interpreted
by the message parser. Words of *TEXT MAY contain characters from character sets other than ISO- 8859-1
only when encoded according to the rules of RFC 2047.
Incoming icy header field-values should be encoded as "ISO−8859−1" before adding them to the metadata structure.
*/
if ((strncmp(icy_token, "icy-name", strlen("icy-name")) == 0) && !metadata->name) if ((strncmp(icy_token, "icy-name", strlen("icy-name")) == 0) && !metadata->name)
metadata->name = strdup(unicode_fixup_string(ptr, headerenc)); metadata->name = strdup(ptr);
else if ((strncmp(icy_token, "icy-description", strlen("icy-description")) == 0) && !metadata->description) else if ((strncmp(icy_token, "icy-description", strlen("icy-description")) == 0) && !metadata->description)
metadata->description = strdup(unicode_fixup_string(ptr, headerenc)); metadata->description = strdup(ptr);
else if ((strncmp(icy_token, "icy-genre", strlen("icy-genre")) == 0) && !metadata->genre) else if ((strncmp(icy_token, "icy-genre", strlen("icy-genre")) == 0) && !metadata->genre)
metadata->genre = strdup(unicode_fixup_string(ptr, headerenc)); metadata->genre = strdup(ptr);
icy_token = strtok(NULL, "\r\n"); icy_token = strtok(NULL, "\r\n");
} }
av_free(buffer); free(utf);
return 0; return 0;
} }