oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

client/Process: move basic syntax check to the beginning of method 

This catches lines within command lists as well.
This commit is contained in:
Max Kellermann 2019-04-03 22:27:41 +02:00
parent d9117a272b
commit f339a53e3c
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/client/Process.cxx
View File

@ -55,6 +55,16 @@ Client::ProcessCommandList(bool list_ok,
CommandResult CommandResult
Client::ProcessLine(char *line) noexcept Client::ProcessLine(char *line) noexcept
{ {
if (IsUpperAlphaASCII(*line)) {
/* no valid MPD command begins with an upper case
letter; this could be a badly routed HTTP
request */
FormatWarning(client_domain,
"[%u] malformed command \"%s\"",
num, line);
return CommandResult::CLOSE;
}
CommandResult ret; CommandResult ret;
if (StringIsEqual(line, "noidle")) { if (StringIsEqual(line, "noidle")) {
@ -119,14 +129,6 @@ Client::ProcessLine(char *line) noexcept
} else if (StringIsEqual(line, CLIENT_LIST_OK_MODE_BEGIN)) { } else if (StringIsEqual(line, CLIENT_LIST_OK_MODE_BEGIN)) {
cmd_list.Begin(true); cmd_list.Begin(true);
ret = CommandResult::OK; ret = CommandResult::OK;
} else if (IsUpperAlphaASCII(*line)) {
/* no valid MPD command begins with an upper
case letter; this could be a badly routed
HTTP request */
FormatWarning(client_domain,
"[%u] malformed command \"%s\"",
num, line);
ret = CommandResult::CLOSE;
} else { } else {
FormatDebug(client_domain, FormatDebug(client_domain,
"[%u] process command \"%s\"", "[%u] process command \"%s\"",