DatabaseCommands: disallow "grouping" by the selected tag

Fixes assertion failure.

DatabaseCommands: disallow "grouping" by the selected tag
95b1a640 · Max Kellermann · ecc12c9b · 95b1a640
Commit 95b1a640 authored Apr 25, 2014 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

DatabaseCommands.cxx src/command/DatabaseCommands.cxx +7 -0

No files found.
--- a/src/command/DatabaseCommands.cxx
+++ b/src/command/DatabaseCommands.cxx
@@ -234,6 +234,13 @@ handle_list(Client &client, int argc, char *argv[])
 		}
 	}

+	if (tagType < TAG_NUM_OF_ITEM_TYPES &&
+	    group_mask & (1u << tagType)) {
+		delete filter;
+		command_error(client, ACK_ERROR_ARG, "Conflicting group");
+		return CommandResult::ERROR;
+	}
+
 	Error error;
 	CommandResult ret =
 		listAllUniqueTags(client, tagType, group_mask, filter, error)