thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CLOUD: Fix Webserver's usage of DefaultSaveFileManager

Browse source 
concatWithSavesPath() is only defined when curl is used, but was used in
Webserver even when curl is unavailable.
This commit is contained in:
Alexander Tkachev 2016-08-30 21:08:02 +06:00
parent 579cb59af5
commit f8fe150130
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backends/networking/sdl_net/handlers/filesbasehandler.cpp
View file

@ -69,8 +69,12 @@ bool FilesBaseHandler::transformPath(Common::String &path, Common::String &prefi
prefixToAdd = "/saves/"; prefixToAdd = "/saves/";
// determine savepath (prefix to remove) // determine savepath (prefix to remove)
#ifdef USE_LIBCURL
DefaultSaveFileManager *manager = dynamic_cast<DefaultSaveFileManager *>(g_system->getSavefileManager()); DefaultSaveFileManager *manager = dynamic_cast<DefaultSaveFileManager *>(g_system->getSavefileManager());
prefixToRemove = (manager ? manager->concatWithSavesPath("") : ConfMan.get("savepath")); prefixToRemove = (manager ? manager->concatWithSavesPath("") : ConfMan.get("savepath"));
#else
prefixToRemove = ConfMan.get("savepath");
#endif
if (prefixToRemove.size() && prefixToRemove.lastChar() != '/' && prefixToRemove.lastChar() != '\\') if (prefixToRemove.size() && prefixToRemove.lastChar() != '/' && prefixToRemove.lastChar() != '\\')
prefixToRemove += '/'; prefixToRemove += '/';

4
backends/networking/sdl_net/handlerutils.cpp
View file

@ -159,8 +159,12 @@ bool HandlerUtils::hasPermittedPrefix(const Common::String &path) {
} }
// prefix for /saves/ // prefix for /saves/
#ifdef USE_LIBCURL
DefaultSaveFileManager *manager = dynamic_cast<DefaultSaveFileManager *>(g_system->getSavefileManager()); DefaultSaveFileManager *manager = dynamic_cast<DefaultSaveFileManager *>(g_system->getSavefileManager());
prefix = (manager ? manager->concatWithSavesPath("") : ConfMan.get("savepath")); prefix = (manager ? manager->concatWithSavesPath("") : ConfMan.get("savepath"));
#else
prefix = ConfMan.get("savepath");
#endif
return (normalized.hasPrefix(normalizePath(prefix))); return (normalized.hasPrefix(normalizePath(prefix)));
} }