MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-02-26 12:59:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1135 from uvjustin/check-utf8-icy-metadata

Browse Source 
Check utf-8 in metadata_packet_get
This commit is contained in:
ejurgensen 2020-11-24 10:16:35 +01:00 committed by GitHub
commit b72fda76c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/http.c
View File

@ -23,6 +23,7 @@
#include <stdio.h>
#include <unistd.h>
#include <uniconv.h>
#include <unistr.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
@ -352,6 +353,7 @@ static int
metadata_packet_get(struct http_icy_metadata *metadata, AVFormatContext *fmtctx)
{
uint8_t *buffer;
uint8_t *utf;
char *icy_token;
char *save_pr;
char *ptr;
@ -361,7 +363,18 @@ metadata_packet_get(struct http_icy_metadata *metadata, AVFormatContext *fmtctx)
if (!buffer)
return -1;
icy_token = strtok_r((char *)buffer, ";", &save_pr);
/* Some servers send ISO-8859-1 instead of UTF-8 */
if (u8_check(buffer, strlen((char *)buffer)))
{
utf = u8_strconv_from_encoding((char *)buffer, "ISO−8859−1", iconveh_question_mark);
av_free(buffer);
if (utf == NULL)
return -1;
}
else
utf = buffer;
icy_token = strtok_r((char *)utf, ";", &save_pr);
while (icy_token != NULL)
{
ptr = strchr(icy_token, '=');
@ -408,7 +421,7 @@ metadata_packet_get(struct http_icy_metadata *metadata, AVFormatContext *fmtctx)
icy_token = strtok_r(NULL, ";", &save_pr);
}
av_free(buffer);
av_free(utf);
if (metadata->title)
metadata->hash = djb_hash(metadata->title, strlen(metadata->title));