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

1) Protect against uninitialised fl in daap_sort_build and 2) Don't

Browse Source 
add blank items in daap group reply
This commit is contained in:
ejurgensen 2013-12-12 23:27:50 +01:00
parent a4f9920a09
commit d1a51ef45d
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/httpd_daap.c
View File

@ -394,16 +394,21 @@ daap_sort_build(struct sort_ctx *ctx, char *str)
char fl; char fl;
len = strlen(str); len = strlen(str);
ret = u8_normalize(UNINORM_NFD, (uint8_t *)str, len, NULL, &len); if (len > 0)
if (!ret)
{ {
DPRINTF(E_LOG, L_DAAP, "Could not normalize string for sort header\n"); ret = u8_normalize(UNINORM_NFD, (uint8_t *)str, len, NULL, &len);
if (!ret)
{
DPRINTF(E_LOG, L_DAAP, "Could not normalize string for sort header\n");
return -1; return -1;
}
fl = ret[0];
free(ret);
} }
else
fl = ret[0]; fl = 0;
free(ret);
if (isascii(fl) && isalpha(fl)) if (isascii(fl) && isalpha(fl))
{ {
@ -1634,6 +1639,10 @@ daap_reply_groups(struct evhttp_request *req, struct evbuffer *evbuf, char **uri
ngrp = 0; ngrp = 0;
while ((ret = db_query_fetch_group(&qp, &dbgri)) == 0) while ((ret = db_query_fetch_group(&qp, &dbgri)) == 0)
{ {
/* Don't add item if no name (eg blank album name) */
if (strlen(dbgri.itemname) == 0)
continue;
ngrp++; ngrp++;
for (i = 0; i < nmeta; i++) for (i = 0; i < nmeta; i++)