Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

src: cleanup Isolate::GetCurrent() #807

Closed
wants to merge 1 commit into from
Closed

src: cleanup Isolate::GetCurrent() #807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions src/node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1687,23 +1687,21 @@ static const char* name_by_gid(gid_t gid) {
#endif


static uid_t uid_by_name(Handle<Value> value) {
static uid_t uid_by_name(Isolate* isolate, Handle<Value> value) {
if (value->IsUint32()) {
return static_cast<uid_t>(value->Uint32Value());
} else {
// TODO(trevnorris): Fix to not use GetCurrent().
node::Utf8Value name(Isolate::GetCurrent(), value);
node::Utf8Value name(isolate, value);
return uid_by_name(*name);
}
}


static gid_t gid_by_name(Handle<Value> value) {
static gid_t gid_by_name(Isolate* isolate, Handle<Value> value) {
if (value->IsUint32()) {
return static_cast<gid_t>(value->Uint32Value());
} else {
// TODO(trevnorris): Fix to not use GetCurrent().
node::Utf8Value name(Isolate::GetCurrent(), value);
node::Utf8Value name(isolate, value);
return gid_by_name(*name);
}
}
Expand All @@ -1728,7 +1726,7 @@ static void SetGid(const FunctionCallbackInfo<Value>& args) {
return env->ThrowTypeError("setgid argument must be a number or a string");
}

gid_t gid = gid_by_name(args[0]);
gid_t gid = gid_by_name(env->isolate(), args[0]);

if (gid == gid_not_found) {
return env->ThrowError("setgid group id does not exist");
Expand All @@ -1747,7 +1745,7 @@ static void SetUid(const FunctionCallbackInfo<Value>& args) {
return env->ThrowTypeError("setuid argument must be a number or a string");
}

uid_t uid = uid_by_name(args[0]);
uid_t uid = uid_by_name(env->isolate(), args[0]);

if (uid == uid_not_found) {
return env->ThrowError("setuid user id does not exist");
Expand Down Expand Up @@ -1809,7 +1807,7 @@ static void SetGroups(const FunctionCallbackInfo<Value>& args) {
gid_t* groups = new gid_t[size];

for (size_t i = 0; i < size; i++) {
gid_t gid = gid_by_name(groups_list->Get(i));
gid_t gid = gid_by_name(env->isolate(), groups_list->Get(i));

if (gid == gid_not_found) {
delete[] groups;
Expand Down Expand Up @@ -1856,7 +1854,7 @@ static void InitGroups(const FunctionCallbackInfo<Value>& args) {
return env->ThrowError("initgroups user not found");
}

extra_group = gid_by_name(args[1]);
extra_group = gid_by_name(env->isolate(), args[1]);

if (extra_group == gid_not_found) {
if (must_free)
Expand Down
2 changes: 1 addition & 1 deletion src/node.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ NODE_EXTERN void RunAtExit(Environment* env);
// Used to be a macro, hence the uppercase name.
#define NODE_DEFINE_CONSTANT(target, constant) \
do { \
v8::Isolate* isolate = v8::Isolate::GetCurrent(); \
v8::Isolate* isolate = target->GetIsolate(); \
v8::Local<v8::String> constant_name = \
v8::String::NewFromUtf8(isolate, #constant); \
v8::Local<v8::Number> constant_value = \
Expand Down
2 changes: 1 addition & 1 deletion src/node_object_wrap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class ObjectWrap {


inline v8::Local<v8::Object> handle() {
return handle(v8::Isolate::GetCurrent());
return v8::Local<v8::Object>::New(handle_->GetIsolate(), persistent());
}


Expand Down
3 changes: 1 addition & 2 deletions src/smalloc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,8 +472,7 @@ const char RetainedAllocInfo::label_[] = "smalloc";


RetainedAllocInfo::RetainedAllocInfo(Handle<Value> wrapper) {
// TODO(trevnorris): Fix to properly acquire the Isolate.
Local<Object> obj = wrapper->ToObject(Isolate::GetCurrent());
Local<Object> obj = wrapper.As<Object>();
length_ = obj->GetIndexedPropertiesExternalArrayDataLength();
data_ = static_cast<char*>(obj->GetIndexedPropertiesExternalArrayData());
}
Expand Down