From c42b20629265a953ecced484a29d7208bcff367b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 8 Aug 2012 01:16:40 +0200 Subject: DatabaseCommands: allow empty criteria for "list" Fixes regression. --- src/DatabaseCommands.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/DatabaseCommands.cxx') diff --git a/src/DatabaseCommands.cxx b/src/DatabaseCommands.cxx index 9dbe4e47f..288980468 100644 --- a/src/DatabaseCommands.cxx +++ b/src/DatabaseCommands.cxx @@ -214,7 +214,7 @@ handle_list(struct client *client, int argc, char *argv[]) conditionals = locate_item_list_new_single((unsigned)TAG_ARTIST, argv[2]); - } else { + } else if (argc > 2) { conditionals = locate_item_list_parse(argv + 2, argc - 2, false); if (conditionals == NULL) { @@ -222,7 +222,8 @@ handle_list(struct client *client, int argc, char *argv[]) "not able to parse args"); return COMMAND_RETURN_ERROR; } - } + } else + conditionals = nullptr; GError *error = NULL; enum command_return ret = @@ -230,7 +231,8 @@ handle_list(struct client *client, int argc, char *argv[]) ? COMMAND_RETURN_OK : print_error(client, error); - locate_item_list_free(conditionals); + if (conditionals != nullptr) + locate_item_list_free(conditionals); return ret; } -- cgit v1.2.3