src: always call ReadStop() before Close()

addaleax · addaleax · commit 7153bec95524 · 2018-05-14T19:19:32.000+02:00
For libuv-backed streams, always explicitly stop reading before closing the handle. PR-URL: #19377 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/src/handle_wrap.h b/src/handle_wrap.h
@@ -70,7 +70,8 @@ class HandleWrap : public AsyncWrap {
 
   inline uv_handle_t* GetHandle() const { return handle_; }
 
-  void Close(v8::Local<v8::Value> close_callback = v8::Local<v8::Value>());
+  virtual void Close(
+      v8::Local<v8::Value> close_callback = v8::Local<v8::Value>());
 
  protected:
   HandleWrap(Environment* env,
diff --git a/src/stream_wrap.cc b/src/stream_wrap.cc
@@ -373,6 +373,11 @@ void LibuvStreamWrap::AfterUvWrite(uv_write_t* req, int status) {
   req_wrap->Done(status);
 }
 
+void LibuvStreamWrap::Close(v8::Local<v8::Value> close_callback) {
+  ReadStop();
+  HandleWrap::Close(close_callback);
+}
+
 }  // namespace node
 
 NODE_BUILTIN_MODULE_CONTEXT_AWARE(stream_wrap,
diff --git a/src/stream_wrap.h b/src/stream_wrap.h
@@ -76,6 +76,8 @@ class LibuvStreamWrap : public HandleWrap, public StreamBase {
   ShutdownWrap* CreateShutdownWrap(v8::Local<v8::Object> object) override;
   WriteWrap* CreateWriteWrap(v8::Local<v8::Object> object) override;
 
+  void Close(v8::Local<v8::Value> close_callback) override;
+
  protected:
   LibuvStreamWrap(Environment* env,
                   v8::Local<v8::Object> object,
