Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

Commit

Permalink
child_process: copy spawnSync() cwd option to proper buffer
Browse files Browse the repository at this point in the history
The spawnSync() cwd option was being copied to the incorrect
location. This commit copies to the correct location.

Closes #7824

Signed-off-by: Fedor Indutny <fedor@indutny.com>
  • Loading branch information
cjihrig authored and indutny committed Jul 12, 2014
1 parent 9452ea2 commit c4e5fde
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/spawn_sync.cc
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ int SyncProcessRunner::ParseOptions(Local<Value> js_value) {

Local<Value> js_cwd = js_options->Get(env()->cwd_string());
if (IsSet(js_cwd)) {
r = CopyJsString(js_cwd, &uv_process_options_.cwd);
r = CopyJsString(js_cwd, &cwd_buffer_);
if (r < 0)
return r;
uv_process_options_.cwd = cwd_buffer_;
Expand Down
16 changes: 16 additions & 0 deletions test/simple/test-child-process-execsync.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,19 @@ assert.deepEqual(ret, msgBuf);
ret = execFileSync(process.execPath, args, { encoding: 'utf8' });

assert.strictEqual(ret, msg + '\n', 'execFileSync encoding result should match');

// Verify that the cwd option works - GH #7824
(function() {
var response;
var cwd;

if (process.platform === 'win32') {
cwd = 'c:\\';
response = execSync('echo %cd%', {cwd: cwd});
} else {
cwd = '/';
response = execSync('pwd', {cwd: cwd});
}

assert.strictEqual(response.toString().trim(), cwd);
})();
16 changes: 16 additions & 0 deletions test/simple/test-child-process-spawnsync.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,19 @@ assert.strictEqual(stop[0], 1, 'sleep should not take longer or less than 1 seco
// Error test when command does not exist
var ret_err = spawnSync('command_does_not_exist');
assert.strictEqual(ret_err.error.code, 'ENOENT');

// Verify that the cwd option works - GH #7824
(function() {
var response;
var cwd;

if (process.platform === 'win32') {
cwd = 'c:\\';
response = spawnSync('cmd.exe', ['/c', 'cd'], {cwd: cwd});
} else {
cwd = '/';
response = spawnSync('pwd', [], {cwd: cwd});
}

assert.strictEqual(response.stdout.toString().trim(), cwd);
})();

0 comments on commit c4e5fde

Please sign in to comment.