github/less.js
1
1
Fork 0
mirror of https://github.com/less/less.js.git synced 2026-04-09 03:00:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Found race condition that caused file not to be skipped in importOnce, leading to random exceptions. Fixes #1931

Browse Source
This commit is contained in:
Luke Page
2014-07-27 16:09:17 +01:00
parent 4b40773f64
commit d750151536
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/less/import-visitor.js
View File

@@ -38,7 +38,7 @@
var importVisitor = this,
evaldImportNode,
inlineCSS = importNode.options.inline;
if (!importNode.css || inlineCSS) {
try {
@@ -61,10 +61,13 @@
}
this._importer.push(importNode.getPath(), importNode.currentFileInfo, importNode.options, function (e, root, importedAtRoot, fullPath) {
if (e && !e.filename) { e.index = importNode.index; e.filename = importNode.currentFileInfo.filename; }
if (e && !e.filename) {
e.index = importNode.index; e.filename = importNode.currentFileInfo.filename;
}
if (!env.importMultiple) {
if (importedAtRoot) {
var duplicateImport = importedAtRoot || fullPath in importVisitor.recursionDetector;
if (!env.importMultiple) {
if (duplicateImport) {
importNode.skip = true;
} else {
importNode.skip = function() {
@@ -73,7 +76,7 @@
}
importVisitor.onceFileDetectionMap[fullPath] = true;
return false;
};
};
}
}
@@ -88,7 +91,6 @@
if (root) {
importNode.root = root;
importNode.importedFilename = fullPath;
var duplicateImport = importedAtRoot || fullPath in importVisitor.recursionDetector;
if (!inlineCSS && (env.importMultiple || !duplicateImport)) {
importVisitor.recursionDetector[fullPath] = true;
@@ -139,4 +141,4 @@
}
};
})(require('./tree'));
})(require('./tree'));