MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some protection against mem leak

This commit is contained in:
ejurgensen 2015-03-17 22:03:40 +01:00
parent e5a1495b49
commit d089eaf880
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/icy.c
View File

@ -67,7 +67,7 @@ metadata_packet_get(struct icy_metadata *metadata, AVFormatContext *fmtctx)
if (end) if (end)
*end = '\0'; *end = '\0';
if (strncmp(icy_token, "StreamTitle", strlen("StreamTitle")) == 0) if ((strncmp(icy_token, "StreamTitle", strlen("StreamTitle")) == 0) && !metadata->title)
{ {
metadata->title = ptr; metadata->title = ptr;
@ -84,8 +84,10 @@ metadata_packet_get(struct icy_metadata *metadata, AVFormatContext *fmtctx)
else else
metadata->title = strdup(metadata->title); metadata->title = strdup(metadata->title);
} }
else if (strncmp(icy_token, "StreamUrl", strlen("StreamUrl")) == 0) else if ((strncmp(icy_token, "StreamUrl", strlen("StreamUrl")) == 0) && !metadata->artwork_url)
metadata->artwork_url = strdup(ptr); {
metadata->artwork_url = strdup(ptr);
}
if (end) if (end)
*end = '\''; *end = '\'';
@ -125,11 +127,11 @@ metadata_header_get(struct icy_metadata *metadata, AVFormatContext *fmtctx)
if (ptr[0] == ' ') if (ptr[0] == ' ')
ptr++; ptr++;
if (strncmp(icy_token, "icy-name", strlen("icy-name")) == 0) if ((strncmp(icy_token, "icy-name", strlen("icy-name")) == 0) && !metadata->name)
metadata->name = strdup(ptr); metadata->name = strdup(ptr);
else if (strncmp(icy_token, "icy-description", strlen("icy-description")) == 0) else if ((strncmp(icy_token, "icy-description", strlen("icy-description")) == 0) && !metadata->description)
metadata->description = strdup(ptr); metadata->description = strdup(ptr);
else if (strncmp(icy_token, "icy-genre", strlen("icy-genre")) == 0) else if ((strncmp(icy_token, "icy-genre", strlen("icy-genre")) == 0) && !metadata->genre)
metadata->genre = strdup(ptr); metadata->genre = strdup(ptr);
icy_token = strtok(NULL, "\r\n"); icy_token = strtok(NULL, "\r\n");