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

fs: execute mkdtemp's callback with no context

Browse Source 
All the callback functions in `fs` module are supposed to be executed
with no context (`this` value should not be a valid object). But
`mkdtemp`'s callback will have the `FSReqWrap` object as the context.

Sample code to reproduce the problem

    'use strict';

    const fs = require('fs');
    fs.mkdtemp('/tmp/abcd', null, function() {
      console.log(this);
    });

This would print

    FSReqWrap { oncomplete: [Function] }

But that should have printed `null` and this patch fixes that.

PR-URL: https://github.com/nodejs/node/pull/7068
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Sakthipriyan Vairamani 2016-05-30 23:15:01 +05:30
parent 1a21524b69
commit c4fadbc15d
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/fs.js
View File

@ -1596,8 +1596,7 @@ fs.realpath = function realpath(path, options, callback) {
}; };
fs.mkdtemp = function(prefix, options, callback_) { fs.mkdtemp = function(prefix, options, callback) {
var callback = maybeCallback(callback_);
if (!prefix || typeof prefix !== 'string') if (!prefix || typeof prefix !== 'string')
throw new TypeError('filename prefix is required'); throw new TypeError('filename prefix is required');
@ -1611,6 +1610,7 @@ fs.mkdtemp = function(prefix, options, callback_) {
if (typeof options !== 'object') if (typeof options !== 'object')
throw new TypeError('"options" must be a string or an object'); throw new TypeError('"options" must be a string or an object');
callback = makeCallback(callback);
if (!nullCheck(prefix, callback)) { if (!nullCheck(prefix, callback)) {
return; return;
} }

17
test/parallel/test-fs-mkdtemp.js
View File

@ -18,12 +18,19 @@ assert.equal(Buffer.byteLength(path.basename(utf8)),
Buffer.byteLength('\u0222abc.XXXXXX')); Buffer.byteLength('\u0222abc.XXXXXX'));
assert(common.fileExists(utf8)); assert(common.fileExists(utf8));
fs.mkdtemp( function handler(err, folder) {
path.join(common.tmpDir, 'bar.'),
common.mustCall(function(err, folder) {
assert.ifError(err); assert.ifError(err);
assert(common.fileExists(folder)); assert(common.fileExists(folder));
}) assert.strictEqual(this, null);
); }
fs.mkdtemp(path.join(common.tmpDir, 'bar.'), common.mustCall(handler));
// Same test as above, but making sure that passing an options object doesn't
// affect the way the callback function is handled.
fs.mkdtemp(path.join(common.tmpDir, 'bar.'), {}, common.mustCall(handler));
// Making sure that not passing a callback doesn't crash, as a default function
// is passed internally.
assert.doesNotThrow(() => fs.mkdtemp(path.join(common.tmpDir, 'bar-'))); assert.doesNotThrow(() => fs.mkdtemp(path.join(common.tmpDir, 'bar-')));
assert.doesNotThrow(() => fs.mkdtemp(path.join(common.tmpDir, 'bar-'), {}));