Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

Commit

Permalink
stream_wrap: reference handle before uv_write2
Browse files Browse the repository at this point in the history
Revert commit 7f2a78b and fix using
empty symbol handle.
  • Loading branch information
indutny committed Jan 27, 2013
1 parent 7f2a78b commit 0972acb
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions src/stream_wrap.cc
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ static Persistent<String> bytes_sym;
static Persistent<String> write_queue_size_sym;
static Persistent<String> onread_sym;
static Persistent<String> oncomplete_sym;
static Persistent<String> handle_sym;
static SlabAllocator* slab_allocator;
static bool initialized;

Expand Down Expand Up @@ -411,6 +412,14 @@ Handle<Value> StreamWrap::WriteStringImpl(const Arguments& args) {
StreamWrap* send_stream_wrap = static_cast<StreamWrap*>(
send_stream_obj->GetAlignedPointerFromInternalField(0));
send_stream = send_stream_wrap->GetStream();

// Reference StreamWrap instance to prevent it from being garbage
// collected before `AfterWrite` is called.
if (handle_sym.IsEmpty()) {
handle_sym = NODE_PSYMBOL("handle");
}
assert(!req_wrap->object_.IsEmpty());
req_wrap->object_->Set(handle_sym, send_stream_obj);
}

r = uv_write2(&req_wrap->req_,
Expand Down Expand Up @@ -468,6 +477,11 @@ void StreamWrap::AfterWrite(uv_write_t* req, int status) {
assert(req_wrap->object_.IsEmpty() == false);
assert(wrap->object_.IsEmpty() == false);

// Unref handle property
if (!handle_sym.IsEmpty()) {
req_wrap->object_->Delete(handle_sym);
}

if (status) {
SetErrno(uv_last_error(uv_default_loop()));
}
Expand Down

0 comments on commit 0972acb

Please sign in to comment.