[Scummvm-git-logs] scummvm master -> 400854663181dd9028a8d1df77f8be5de770e9ef
lephilousophe
noreply at scummvm.org
Sat Nov 2 21:53:28 UTC 2024
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
4008546631 BACKENDS: NETWORKING: Properly use urlToPath
Commit: 400854663181dd9028a8d1df77f8be5de770e9ef
https://github.com/scummvm/scummvm/commit/400854663181dd9028a8d1df77f8be5de770e9ef
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-11-02T22:52:59+01:00
Commit Message:
BACKENDS: NETWORKING: Properly use urlToPath
urlToPath can return an empty string if uploading or creating a
directory at the root.
Changed paths:
backends/networking/sdl_net/handlers/createdirectoryhandler.cpp
backends/networking/sdl_net/handlers/uploadfilehandler.cpp
diff --git a/backends/networking/sdl_net/handlers/createdirectoryhandler.cpp b/backends/networking/sdl_net/handlers/createdirectoryhandler.cpp
index 0acff90a6fb..f1d3a5c3da7 100644
--- a/backends/networking/sdl_net/handlers/createdirectoryhandler.cpp
+++ b/backends/networking/sdl_net/handlers/createdirectoryhandler.cpp
@@ -68,7 +68,7 @@ void CreateDirectoryHandler::handle(Client &client) {
// transform virtual path to actual file system one
Common::String basePath;
Common::Path baseFSPath, fsPath;
- if (!urlToPath(path, fsPath, basePath, baseFSPath) || path.empty()) {
+ if (!urlToPath(path, fsPath, basePath, baseFSPath)) {
handleError(client, Common::convertFromU32String(_("Invalid path!")));
return;
}
diff --git a/backends/networking/sdl_net/handlers/uploadfilehandler.cpp b/backends/networking/sdl_net/handlers/uploadfilehandler.cpp
index 0213a6b43fc..220fc8f853e 100644
--- a/backends/networking/sdl_net/handlers/uploadfilehandler.cpp
+++ b/backends/networking/sdl_net/handlers/uploadfilehandler.cpp
@@ -51,7 +51,7 @@ void UploadFileHandler::handle(Client &client) {
// transform virtual path to actual file system one
Common::String basePath;
Common::Path baseFSPath, fsPath;
- if (!urlToPath(path, fsPath, basePath, baseFSPath, false) || path.empty()) {
+ if (!urlToPath(path, fsPath, basePath, baseFSPath)) {
HandlerUtils::setFilesManagerErrorMessageHandler(client, Common::convertFromU32String(_("Invalid path!")));
return;
}
More information about the Scummvm-git-logs
mailing list