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

command/FileCommands: fix access to absolute paths in "readcomments"

Browse Source
This commit is contained in:
Max Kellermann
2015-10-20 11:25:46 +02:00
parent 42bd888946
commit 81ce684b35
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/command/FileCommands.cxx
View File

@@ -218,9 +218,9 @@ handle_read_comments(Client &client, Request args, Response &r)
assert(args.size == 1); assert(args.size == 1);
const char *const uri = translate_uri(args.front()); const char *const uri = translate_uri(args.front());
if (memcmp(uri, "file:///", 8) == 0) { if (PathTraitsUTF8::IsAbsolute(uri)) {
/* read comments from arbitrary local file */ /* read comments from arbitrary local file */
const char *path_utf8 = uri + 7; const char *path_utf8 = uri;
AllocatedPath path_fs = AllocatedPath::FromUTF8(path_utf8); AllocatedPath path_fs = AllocatedPath::FromUTF8(path_utf8);
if (path_fs.IsNull()) { if (path_fs.IsNull()) {
r.Error(ACK_ERROR_NO_EXIST, "unsupported file name"); r.Error(ACK_ERROR_NO_EXIST, "unsupported file name");
@@ -234,7 +234,7 @@ handle_read_comments(Client &client, Request args, Response &r)
return read_file_comments(r, path_fs); return read_file_comments(r, path_fs);
} else if (uri_has_scheme(uri)) { } else if (uri_has_scheme(uri)) {
return read_stream_comments(r, uri); return read_stream_comments(r, uri);
} else if (!PathTraitsUTF8::IsAbsolute(uri)) { } else {
#ifdef ENABLE_DATABASE #ifdef ENABLE_DATABASE
const Storage *storage = client.GetStorage(); const Storage *storage = client.GetStorage();
if (storage == nullptr) { if (storage == nullptr) {
@@ -259,8 +259,5 @@ handle_read_comments(Client &client, Request args, Response &r)
r.Error(ACK_ERROR_NO_EXIST, "No such file"); r.Error(ACK_ERROR_NO_EXIST, "No such file");
return CommandResult::ERROR; return CommandResult::ERROR;
#endif #endif
} else {
r.Error(ACK_ERROR_NO_EXIST, "No such file");
return CommandResult::ERROR;
} }
} }