Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

handle_wrap: don't abort if wrap == NULL

After a disconnect, the internal pointer of the parent/child channel is set to
NULL. That's not an error so don't abort().
  • Loading branch information...
commit 17ef062db1f4b2a952d7c540ebb08acb8077f3e8 1 parent 86d4cf7
@bnoordhuis authored
Showing with 16 additions and 6 deletions.
  1. +16 −6 src/handle_wrap.cc
View
22 src/handle_wrap.cc
@@ -23,6 +23,12 @@
#include "ngx-queue.h"
#include "handle_wrap.h"
+#define UNWRAP_NO_ABORT(type) \
+ assert(!args.Holder().IsEmpty()); \
+ assert(args.Holder()->InternalFieldCount() > 0); \
+ type* wrap = \
+ static_cast<type*>(args.Holder()->GetPointerFromInternalField(0));
+
namespace node {
using v8::Array;
@@ -53,10 +59,12 @@ void HandleWrap::Initialize(Handle<Object> target) {
Handle<Value> HandleWrap::Ref(const Arguments& args) {
HandleScope scope;
- UNWRAP(HandleWrap)
+ UNWRAP_NO_ABORT(HandleWrap)
- uv_ref(wrap->handle__);
- wrap->unref_ = false;
+ if (wrap) {
+ uv_ref(wrap->handle__);
+ wrap->unref_ = false;
+ }
return v8::Undefined();
}
@@ -65,10 +73,12 @@ Handle<Value> HandleWrap::Ref(const Arguments& args) {
Handle<Value> HandleWrap::Unref(const Arguments& args) {
HandleScope scope;
- UNWRAP(HandleWrap)
+ UNWRAP_NO_ABORT(HandleWrap)
- uv_unref(wrap->handle__);
- wrap->unref_ = true;
+ if (wrap) {
+ uv_unref(wrap->handle__);
+ wrap->unref_ = true;
+ }
return v8::Undefined();
}
Please sign in to comment.
Something went wrong with that request. Please try again.