Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-14 11:55:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

trying some more to get /~/ to work right

Browse source
This commit is contained in:
Seth Alves 2016-04-28 18:29:08 -07:00
parent 8c2b89b910
commit ced18fe6be
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libraries/script-engine/src/ScriptEngines.cpp
View file

@ -83,18 +83,13 @@ QUrl expandScriptUrl(const QUrl& rawScriptURL) {
QUrl defaultScriptsLoc = defaultScriptsLocation();
url.setPath(defaultScriptsLoc.path() + "/" + splitPath.mid(2).join("/")); // 2 to skip the slashes in /~/
// stop something like Script.include(["/~/../Users/james/Desktop/naughty.js"]); from working
qDebug() << "url: " << url.path();
qDebug() << "BEFORE: " << url.path();
// stop something like Script.include(["/~/../Desktop/naughty.js"]); from working
QFileInfo fileInfo(url.toLocalFile());
url = QUrl::fromLocalFile(fileInfo.absoluteFilePath());
qDebug() << "AFTER: " << url.path();
qDebug() << "default: " << defaultScriptsLoc.path();
url = QUrl::fromLocalFile(fileInfo.canonicalFilePath());
if (!defaultScriptsLoc.isParentOf(url)) {
qCWarning(scriptengine) << "Script.include() ignoring file path" << normalizedScriptURL
<< "outside of standard libraries" << url.path() << defaultScriptsLoc.path();
// return QUrl("");
qCWarning(scriptengine) << "Script.include() ignoring file path" << rawScriptURL
<< "-- outside of standard libraries: " << url.path() << defaultScriptsLoc.path();
return QUrl("");
}
return url;
}