MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-27 06:33:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

[mpd] use qualifier in select queries, return error message if an error

Browse Source 
occurs (otherwise this results in a segfault)
This commit is contained in:
chme 2016-01-16 14:26:18 +01:00
parent 2611d06ab7
commit 171e30aead
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mpd.c
View File

@ -1557,13 +1557,13 @@ mpd_queueitem_make(char *path, int recursive)
if (recursive) if (recursive)
{ {
qp.filter = sqlite3_mprintf("disabled = 0 AND f.virtual_path LIKE '/%q%%'", path); qp.filter = sqlite3_mprintf("f.disabled = 0 AND f.virtual_path LIKE '/%q%%'", path);
if (!qp.filter) if (!qp.filter)
DPRINTF(E_DBG, L_PLAYER, "Out of memory\n"); DPRINTF(E_DBG, L_PLAYER, "Out of memory\n");
} }
else else
{ {
qp.filter = sqlite3_mprintf("disabled = 0 AND f.virtual_path LIKE '/%q'", path); qp.filter = sqlite3_mprintf("f.disabled = 0 AND f.virtual_path LIKE '/%q'", path);
if (!qp.filter) if (!qp.filter)
DPRINTF(E_DBG, L_PLAYER, "Out of memory\n"); DPRINTF(E_DBG, L_PLAYER, "Out of memory\n");
} }
@ -2702,7 +2702,7 @@ mpd_add_directory(struct evbuffer *evbuf, int directory_id, int listall, int lis
qp.type = Q_PL; qp.type = Q_PL;
qp.sort = S_PLAYLIST; qp.sort = S_PLAYLIST;
qp.idx_type = I_NONE; qp.idx_type = I_NONE;
qp.filter = sqlite3_mprintf("(directory_id = %d AND (f.type = %d OR f.type = %d))", directory_id, PL_PLAIN, PL_SMART); qp.filter = sqlite3_mprintf("(f.directory_id = %d AND (f.type = %d OR f.type = %d))", directory_id, PL_PLAIN, PL_SMART);
ret = db_query_start(&qp); ret = db_query_start(&qp);
if (ret < 0) if (ret < 0)
{ {
@ -2777,14 +2777,14 @@ mpd_add_directory(struct evbuffer *evbuf, int directory_id, int listall, int lis
qp.type = Q_ITEMS; qp.type = Q_ITEMS;
qp.sort = S_ARTIST; qp.sort = S_ARTIST;
qp.idx_type = I_NONE; qp.idx_type = I_NONE;
qp.filter = sqlite3_mprintf("(directory_id = %d)", directory_id); qp.filter = sqlite3_mprintf("(f.directory_id = %d)", directory_id);
ret = db_query_start(&qp); ret = db_query_start(&qp);
if (ret < 0) if (ret < 0)
{ {
db_query_end(&qp); db_query_end(&qp);
ret = asprintf(errmsg, "Could not start query"); ret = asprintf(errmsg, "Could not start query");
if (ret < 0) if (ret < 0)
DPRINTF(E_LOG, L_MPD, "Out of memory\n"); DPRINTF(E_LOG, L_MPD, "Out of memory\n");
return ACK_ERROR_UNKNOWN; return ACK_ERROR_UNKNOWN;
} }
while (((ret = db_query_fetch_file(&qp, &dbmfi)) == 0) && (dbmfi.id)) while (((ret = db_query_fetch_file(&qp, &dbmfi)) == 0) && (dbmfi.id))
@ -2872,7 +2872,9 @@ mpd_command_listallinfo(struct evbuffer *evbuf, int argc, char **argv, char **er
if ((ret < 0) || (ret >= sizeof(parent))) if ((ret < 0) || (ret >= sizeof(parent)))
{ {
DPRINTF(E_INFO, L_MPD, "Parent path exceeds PATH_MAX\n"); ret = asprintf(errmsg, "Parent path exceeds PATH_MAX\n");
if (ret < 0)
DPRINTF(E_LOG, L_MPD, "Out of memory\n");
return -1; return -1;
} }
@ -2880,7 +2882,9 @@ mpd_command_listallinfo(struct evbuffer *evbuf, int argc, char **argv, char **er
dir_id = db_directory_id_byvirtualpath(parent); dir_id = db_directory_id_byvirtualpath(parent);
if (dir_id == 0) if (dir_id == 0)
{ {
DPRINTF(E_LOG, L_MPD, "Directory info not found for virtual-path '%s'\n", parent); ret = asprintf(errmsg, "Directory info not found for virtual-path '%s'\n", parent);
if (ret < 0)
DPRINTF(E_LOG, L_MPD, "Out of memory\n");
return -1; return -1;
} }