diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/stream_base-inl.h | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/src/stream_base-inl.h b/src/stream_base-inl.h index 099e105334..e8e73f007e 100644 --- a/src/stream_base-inl.h +++ b/src/stream_base-inl.h @@ -77,8 +77,13 @@ void StreamBase::AddMethods(Environment* env, template <class Base> void StreamBase::GetFD(Local<String> key, const PropertyCallbackInfo<Value>& args) { - StreamBase* wrap = Unwrap<Base>(args.Holder()); + Base* handle = Unwrap<Base>(args.Holder()); + // Mimic implementation of StreamBase::GetFD() and UDPWrap::GetFD(). + if (handle == nullptr) + return args.GetReturnValue().Set(-1); + + StreamBase* wrap = static_cast<StreamBase*>(handle); if (!wrap->IsAlive()) return args.GetReturnValue().Set(UV_EINVAL); @@ -89,8 +94,13 @@ void StreamBase::GetFD(Local<String> key, template <class Base> void StreamBase::GetBytesRead(Local<String> key, const PropertyCallbackInfo<Value>& args) { - StreamBase* wrap = Unwrap<Base>(args.Holder()); + Base* handle = Unwrap<Base>(args.Holder()); + + // The handle instance hasn't been set. So no bytes could have been read. + if (handle == nullptr) + return args.GetReturnValue().Set(0); + StreamBase* wrap = static_cast<StreamBase*>(handle); // uint64_t -> double. 53bits is enough for all real cases. args.GetReturnValue().Set(static_cast<double>(wrap->bytes_read_)); } @@ -99,8 +109,12 @@ void StreamBase::GetBytesRead(Local<String> key, template <class Base> void StreamBase::GetExternal(Local<String> key, const PropertyCallbackInfo<Value>& args) { - StreamBase* wrap = Unwrap<Base>(args.Holder()); + Base* handle = Unwrap<Base>(args.Holder()); + if (handle == nullptr) + return args.GetReturnValue().SetUndefined(); + + StreamBase* wrap = static_cast<StreamBase*>(handle); Local<External> ext = External::New(args.GetIsolate(), wrap); args.GetReturnValue().Set(ext); } @@ -109,8 +123,12 @@ void StreamBase::GetExternal(Local<String> key, template <class Base, int (StreamBase::*Method)(const FunctionCallbackInfo<Value>& args)> void StreamBase::JSMethod(const FunctionCallbackInfo<Value>& args) { - StreamBase* wrap = Unwrap<Base>(args.Holder()); + Base* handle = Unwrap<Base>(args.Holder()); + + if (handle == nullptr) + return args.GetReturnValue().SetUndefined(); + StreamBase* wrap = static_cast<StreamBase*>(handle); if (!wrap->IsAlive()) return args.GetReturnValue().Set(UV_EINVAL); |