diff --git a/lib/_http_common.js b/lib/_http_common.js index cf37bbebe36197..6ad13104772ede 100644 --- a/lib/_http_common.js +++ b/lib/_http_common.js @@ -190,6 +190,7 @@ var parsers = new FreeList('parsers', 1000, function() { return parser; }); +function closeParserInstance(parser) { parser.close(); } // Free the parser and also break any links that it // might have to any other things. @@ -212,7 +213,9 @@ function freeParser(parser, req, socket) { parser.outgoing = null; parser[kOnExecute] = null; if (parsers.free(parser) === false) { - parser.close(); + // Make sure the parser's stack has unwound before deleting the + // corresponding C++ object through .close(). + setImmediate(closeParserInstance, parser); } else { // Since the Parser destructor isn't going to run the destroy() callbacks // it needs to be triggered manually. diff --git a/src/node_http_parser.cc b/src/node_http_parser.cc index f378a0475a65c0..46519180619f87 100644 --- a/src/node_http_parser.cc +++ b/src/node_http_parser.cc @@ -392,8 +392,7 @@ class Parser : public AsyncWrap { Parser* parser; ASSIGN_OR_RETURN_UNWRAP(&parser, args.Holder()); - if (--parser->refcount_ == 0) - delete parser; + delete parser; } @@ -559,22 +558,6 @@ class Parser : public AsyncWrap { } protected: - class ScopedRetainParser { - public: - explicit ScopedRetainParser(Parser* p) : p_(p) { - CHECK_GT(p_->refcount_, 0); - p_->refcount_++; - } - - ~ScopedRetainParser() { - if (0 == --p_->refcount_) - delete p_; - } - - private: - Parser* const p_; - }; - static const size_t kAllocBufferSize = 64 * 1024; static void OnAllocImpl(size_t suggested_size, uv_buf_t* buf, void* ctx) { @@ -611,8 +594,6 @@ class Parser : public AsyncWrap { if (nread == 0) return; - ScopedRetainParser retain(parser); - parser->current_buffer_.Clear(); Local ret = parser->Execute(buf->base, nread); @@ -750,10 +731,7 @@ class Parser : public AsyncWrap { char* current_buffer_data_; StreamResource::Callback prev_alloc_cb_; StreamResource::Callback prev_read_cb_; - int refcount_ = 1; static const struct http_parser_settings settings; - - friend class ScopedRetainParser; };