MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-04-01 02:03:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

[smartpl/daap] Fix some error checks after PR #1386

Browse Source
This commit is contained in:
ejurgensen 2022-01-30 15:34:54 +01:00
parent bc1c3e7bd3
commit 17b9ce0969
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dmap_common.c
View File

@ -642,6 +642,9 @@ dmap_query_parse_sql(const char *dmap_query)
{ {
struct daap_result result; struct daap_result result;
if (!dmap_query)
return NULL;
DPRINTF(E_SPAM, L_DAAP, "Parse DMAP query input '%s'\n", dmap_query); DPRINTF(E_SPAM, L_DAAP, "Parse DMAP query input '%s'\n", dmap_query);
if (daap_lex_parse(&result, dmap_query) != 0) if (daap_lex_parse(&result, dmap_query) != 0)

8
src/smartpl_query.c
View File

@ -90,6 +90,12 @@ smartpl_query_parse_string(struct smartpl *smartpl, const char *expression)
{ {
struct smartpl_result result; struct smartpl_result result;
if (!expression)
{
DPRINTF(E_WARN, L_SCAN, "Parse smartpl query input is null\n");
return -1;
}
DPRINTF(E_SPAM, L_SCAN, "Parse smartpl query input '%s'\n", expression); DPRINTF(E_SPAM, L_SCAN, "Parse smartpl query input '%s'\n", expression);
if (smartpl_lex_parse(&result, expression) != 0) if (smartpl_lex_parse(&result, expression) != 0)
@ -98,7 +104,7 @@ smartpl_query_parse_string(struct smartpl *smartpl, const char *expression)
return -1; return -1;
} }
if (!result.title || !result.where) if (result.title[0] == '\0' || !result.where)
{ {
DPRINTF(E_LOG, L_SCAN, "Missing title or filter when parsing '%s'\n", expression); DPRINTF(E_LOG, L_SCAN, "Missing title or filter when parsing '%s'\n", expression);
return -1; return -1;