Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 3 files). Show all
Unified · Split
| @@ -914,7 +914,12 @@ void ScriptEngine::include(const QStringList& includeFiles, QScriptValue callbac · 913 unmodified lines | ||
| 914 | 914 | for (QString file : includeFiles) { |
| 915 | 915 | QUrl thisURL; |
| 916 | 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 | 923 | } else { |
| 919 | 924 | thisURL = resolvePath(file); |
| 920 | 925 | } |