Skip to content

M
mpd
Commit f339a53e authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

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

This catches lines within command lists as well.
parent d9117a27
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 8 deletions
src/client/Process.cxx
View file @ f339a53e
...@@ -55,6 +55,16 @@ Client::ProcessCommandList(bool list_ok, ...@@ -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 ...@@ -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\"",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment