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

command: reject unsupported URI schemes

Browse Source 
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.
This commit is contained in:
Max Kellermann 2008-12-16 21:23:29 +01:00
parent c50115f9a2
commit 5aa1afe693
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/command.c
View File

@ -450,6 +450,12 @@ handle_add(struct client *client, G_GNUC_UNUSED int argc, char *argv[])
if (isRemoteUrl(path)) if (isRemoteUrl(path))
return addToPlaylist(path, NULL); 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); result = addAllIn(path);
if (result == (enum playlist_result)-1) { if (result == (enum playlist_result)-1) {
command_error(client, ACK_ERROR_NO_EXIST, 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)) if (isRemoteUrl(path))
result = spl_append_uri(path, playlist); 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); result = addAllInToStoredPlaylist(path, playlist);
if (result == (enum playlist_result)-1) { if (result == (enum playlist_result)-1) {