command: reject unsupported URI schemes

When a client-specified URI has a scheme which is not supported, do not try to open it as a local file, but provide a meaningful error message.

command: reject unsupported URI schemes
5aa1afe6 · Max Kellermann · c50115f9 · 5aa1afe6
Commit 5aa1afe6 authored Dec 16, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

command.c src/command.c +11 -1

No files found.
--- a/src/command.c
+++ b/src/command.c
@@ -450,6 +450,12 @@ handle_add(struct client *client, G_GNUC_UNUSED int argc, char *argv[])
 	if (isRemoteUrl(path))
 		return addToPlaylist(path, NULL);

+	if (uri_has_scheme(path)) {
+		command_error(client, ACK_ERROR_NO_EXIST,
+			      "unsupported URI scheme");
+		return COMMAND_RETURN_ERROR;
+	}
+
 	result = addAllIn(path);
 	if (result == (enum playlist_result)-1) {
 		command_error(client, ACK_ERROR_NO_EXIST,
@@ -1223,7 +1229,11 @@ handle_playlistadd(struct client *client, G_GNUC_UNUSED int argc, char *argv[])

 	if (isRemoteUrl(path))
 		result = spl_append_uri(path, playlist);
-	else
+	else if (uri_has_scheme(path)) {
+		command_error(client, ACK_ERROR_NO_EXIST,
+			      "unsupported URI scheme");
+		return COMMAND_RETURN_ERROR;
+	} else
 		result = addAllInToStoredPlaylist(path, playlist);

 	if (result == (enum playlist_result)-1) {