diff options
author | Trevor Norris <trev.norris@gmail.com> | 2016-04-13 13:16:42 -0600 |
---|---|---|
committer | Trevor Norris <trev.norris@gmail.com> | 2016-05-24 14:40:22 -0600 |
commit | c0e6c668e6e6f0ba6a924a5b83ff1ca5434d14ad (patch) | |
tree | 2f24e1329abb6b5432273246b4754ec44e7b3e8a /src/stream_wrap.cc | |
parent | 13e5d4f32014e3426142580a699d0ffdf02db26a (diff) | |
download | android-node-v8-c0e6c668e6e6f0ba6a924a5b83ff1ca5434d14ad.tar.gz android-node-v8-c0e6c668e6e6f0ba6a924a5b83ff1ca5434d14ad.tar.bz2 android-node-v8-c0e6c668e6e6f0ba6a924a5b83ff1ca5434d14ad.zip |
src: no abort from getter if object isn't wrapped
v8::Object::GetAlignedPointerFromInternalField() returns a random value
if Wrap() hasn't been run on the object handle. Causing v8 to abort if
certain getters are accessed. It's possible to access these getters and
functions during class construction through the AsyncWrap init()
callback, and also possible in a subset of those scenarios while running
the persistent handle visitor.
Mitigate this issue by manually setting the internal aligned pointer
field to nullptr in the BaseObject constructor and add necessary logic
to return appropriate values when nullptr is encountered.
PR-URL: https://github.com/nodejs/node/pull/6184
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Diffstat (limited to 'src/stream_wrap.cc')
-rw-r--r-- | src/stream_wrap.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/stream_wrap.cc b/src/stream_wrap.cc index b942e48078..f3f1d3bfdf 100644 --- a/src/stream_wrap.cc +++ b/src/stream_wrap.cc @@ -170,7 +170,8 @@ static Local<Object> AcceptHandle(Environment* env, StreamWrap* parent) { if (wrap_obj.IsEmpty()) return Local<Object>(); - WrapType* wrap = Unwrap<WrapType>(wrap_obj); + WrapType* wrap; + ASSIGN_OR_RETURN_UNWRAP(&wrap, wrap_obj, Local<Object>()); handle = wrap->UVHandle(); if (uv_accept(parent->stream(), reinterpret_cast<uv_stream_t*>(handle))) @@ -262,7 +263,8 @@ void StreamWrap::OnRead(uv_stream_t* handle, void StreamWrap::SetBlocking(const FunctionCallbackInfo<Value>& args) { - StreamWrap* wrap = Unwrap<StreamWrap>(args.Holder()); + StreamWrap* wrap; + ASSIGN_OR_RETURN_UNWRAP(&wrap, args.Holder()); CHECK_GT(args.Length(), 0); if (!wrap->IsAlive()) |