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

Merge pull request #70 from jmaggard10/fixes-20141217 

Fixes misc bugs
This commit is contained in:
ejurgensen 2014-12-18 16:35:54 +01:00
parent 6cfb37fb10 cdb0048082
commit 2a99c78c47
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DAAP2SQL.g
View File

@ -252,7 +252,7 @@ expr returns [ pANTLR3_STRING result, int valid ]
val[0] = '\%';
}
if (val[strlen((char *)val) - 1] == '*')
if (val[0] && val[1] && val[strlen((char *)val) - 1] == '*')
{
op = '\%';
val[strlen((char *)val) - 1] = '\%';

10
src/httpd_daap.c
View File

@ -1009,7 +1009,7 @@ daap_reply_update(struct evhttp_request *req, struct evbuffer *evbuf, char **uri
param = evhttp_find_header(query, "revision-number");
if (!param)
{
DPRINTF(E_LOG, L_DAAP, "Missing revision-number in client update request\n");
DPRINTF(E_DBG, L_DAAP, "Missing revision-number in client update request\n");
/* Some players (Amarok, Banshee) don't supply a revision number.
They get a standard update of everything. */
param = "1"; /* Default to "1" will insure update */
@ -1913,7 +1913,10 @@ daap_reply_groups(struct evhttp_request *req, struct evbuffer *evbuf, char **uri
evbuffer_free(group);
if (qp.filter)
free(qp.filter);
{
free(qp.filter);
qp.filter = NULL;
}
if (ret < 0)
{
@ -1993,8 +1996,7 @@ daap_reply_groups(struct evhttp_request *req, struct evbuffer *evbuf, char **uri
evbuffer_free(grouplist);
out_qfilter_free:
if (qp.filter)
free(qp.filter);
free(qp.filter);
return -1;
}