1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

module: fix resolution of filename with trailing slash

Browse Source 
A recent optimization of module loading performance [1] forgot to check that
extensions were set in a certain code path.

[1] ae18bbef48

Fixes: https://github.com/nodejs/node/issues/6214
PR-URL: https://github.com/nodejs/node/pull/6215
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Brian White <mscdex@mscdex.net>
This commit is contained in:
Michaël Zasso 2016-04-15 13:32:36 +02:00 committed by James M Snell
parent 8636af1012
commit 75487f0db8
4 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/module.js
View File

@ -170,6 +170,8 @@ Module._findPath = function(request, paths) {
}
if (!filename) {
if (exts === undefined)
exts = Object.keys(Module._extensions);
filename = tryPackage(basePath, exts);
}

3
test/fixtures/module-require/not-found/node_modules/module1/package.json generated vendored Normal file
View File

@ -0,0 +1,3 @@
{
"main": "doesnotexist"
}

1
test/fixtures/module-require/not-found/trailingSlash.js vendored Normal file
View File

@ -0,0 +1 @@
require('module1/');

24
test/parallel/test-require-exceptions.js
View File

@ -14,9 +14,21 @@ assert.throws(function() {
// Requiring a module that does not exist should throw an
// error with its `code` set to MODULE_NOT_FOUND
assert.throws(function() {
require(common.fixturesDir + '/DOES_NOT_EXIST');
}, function(e) {
assert.equal('MODULE_NOT_FOUND', e.code);
return true;
});
assertModuleNotFound('/DOES_NOT_EXIST');
assertExists('/module-require/not-found/trailingSlash.js');
assertExists('/module-require/not-found/node_modules/module1/package.json');
assertModuleNotFound('/module-require/not-found/trailingSlash');
function assertModuleNotFound(path) {
assert.throws(function() {
require(common.fixturesDir + path);
}, function(e) {
assert.strictEqual(e.code, 'MODULE_NOT_FOUND');
return true;
});
}
function assertExists(fixture) {
assert(common.fileExists(common.fixturesDir + fixture));
}