Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix path length checks when copying js files (#9191)

This commit is contained in:
Jan 2019-06-05 10:39:52 +02:00 committed by GitHub
parent 1d2071420b
commit e0c94e64d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arangod/V8Server/V8DealerFeature.cpp
View File

@ -504,11 +504,12 @@ void V8DealerFeature::copyInstallationFiles() {
if (filename.size() >= nodeModulesPath.size()) { if (filename.size() >= nodeModulesPath.size()) {
std::string normalized = filename; std::string normalized = filename;
FileUtils::normalizePath(normalized); FileUtils::normalizePath(normalized);
TRI_ASSERT(filename.size() == normalized.size()); if ((!nodeModulesPath.empty() &&
if (normalized.substr(normalized.size() - nodeModulesPath.size(), normalized.size() >= nodeModulesPath.size() &&
nodeModulesPath.size()) == nodeModulesPath || normalized.substr(normalized.size() - nodeModulesPath.size(), nodeModulesPath.size()) == nodeModulesPath) ||
normalized.substr(normalized.size() - nodeModulesPathVersioned.size(), (!nodeModulesPathVersioned.empty() &&
nodeModulesPathVersioned.size()) == nodeModulesPathVersioned) { normalized.size() >= nodeModulesPathVersioned.size() &&
normalized.substr(normalized.size() - nodeModulesPathVersioned.size(), nodeModulesPathVersioned.size()) == nodeModulesPathVersioned)) {
// filter it out! // filter it out!
return true; return true;
} }