daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

process: don't use strdup() 

file and cwd can be directly used from Utf8Value.
pull/24503/head
ssuda 2012-03-20 21:09:49 +05:30 committed by Ben Noordhuis
parent 415bff26fe
commit 253ec6a63d
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/process_wrap.cc
View File

@ -107,9 +107,9 @@ class ProcessWrap : public HandleWrap {
// options.file
Local<Value> file_v = js_options->Get(String::New("file"));
if (!file_v.IsEmpty() && file_v->IsString()) {
String::Utf8Value file(file_v->ToString());
options.file = strdup(*file);
String::Utf8Value file(file_v->IsString() ? file_v : Local<Value>());
if (file.length() > 0) {
options.file = *file;
}
// options.args
@ -128,11 +128,9 @@ class ProcessWrap : public HandleWrap {
// options.cwd
Local<Value> cwd_v = js_options->Get(String::New("cwd"));
if (!cwd_v.IsEmpty() && cwd_v->IsString()) {
String::Utf8Value cwd(cwd_v->ToString());
if (cwd.length() > 0) {
options.cwd = strdup(*cwd);
}
String::Utf8Value cwd(cwd_v->IsString() ? cwd_v : Local<Value>());
if (cwd.length() > 0) {
options.cwd = *cwd;
}
// options.env
@ -191,9 +189,6 @@ class ProcessWrap : public HandleWrap {
delete [] options.args;
}
free(options.cwd);
free((void*)options.file);
if (options.env) {
for (int i = 0; options.env[i]; i++) free(options.env[i]);
delete [] options.env;