History

more work toward keeping /~/../.. from working

Seth Alves committed 10 years ago

Commit f03130f1 parent ced18fe3 files · +26 −6Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 3 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+6−1
@@ -914,7 +914,12 @@ void ScriptEngine::include(const QStringList& includeFiles, QScriptValue callbac · 913 unmodified lines
914 for (QString file : includeFiles) {914 for (QString file : includeFiles) {
915 QUrl thisURL;915 QUrl thisURL;
916 if (file.startsWith("/~/")) {916 if (file.startsWith("/~/")) {
917 thisURL = expandScriptUrl(QUrl::fromLocalFile(file));917 thisURL = expandScriptUrl(QUrl::fromLocalFile(expandScriptPath(file)));
918 QUrl defaultScriptsLoc = defaultScriptsLocation();
919 if (!defaultScriptsLoc.isParentOf(thisURL)) {
920 qDebug() << "ScriptEngine::include -- skipping" << file << "-- outside of standard libraries";
921 continue;
922 }
918 } else {923 } else {
919 thisURL = resolvePath(file);924 thisURL = resolvePath(file);
920 }925 }