stream: fix duplicate logic in stream destroy

Fix duplicate logic in stream destroy as the same logic is being shared across methods and thus can be encapsulated into a single method. PR-URL: #35727 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Anto Aravinth <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Robert Nagy <[email protected]> Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: Ricky Zhou <[email protected]>
nodejs · Nov 3, 2020 · 88eb619 · 88eb619
1 parent e0a1541
commit 88eb619
Showing 1 changed file with 16 additions and 22 deletions.
diff --git a/lib/internal/streams/destroy.js b/lib/internal/streams/destroy.js
@@ -8,6 +8,20 @@ const { Symbol } = primordials;
 const kDestroy = Symbol('kDestroy');
 const kConstruct = Symbol('kConstruct');
 
+function checkError(err, w, r) {
+  if (err) {
+    // Avoid V8 leak, https://github.com/nodejs/node/pull/34103#issuecomment-652002364
+    err.stack;
+
+    if (w && !w.errored) {
+      w.errored = err;
+    }
+    if (r && !r.errored) {
+      r.errored = err;
+    }
+  }
+}
+
 // Backwards compat. cb() is undocumented and unused in core but
 // unfortunately might be used by modules.
 function destroy(err, cb) {
@@ -24,20 +38,10 @@ function destroy(err, cb) {
     return this;
   }
 
-  if (err) {
-    // Avoid V8 leak, https://github.com/nodejs/node/pull/34103#issuecomment-652002364
-    err.stack;
-
-    if (w && !w.errored) {
-      w.errored = err;
-    }
-    if (r && !r.errored) {
-      r.errored = err;
-    }
-  }
 
   // We set destroyed to true before firing error callbacks in order
   // to make it re-entrance safe in case destroy() is called within callbacks
+  checkError(err, w, r);
 
   if (w) {
     w.destroyed = true;
@@ -66,17 +70,7 @@ function _destroy(self, err, cb) {
 
     called = true;
 
-    if (err) {
-      // Avoid V8 leak, https://github.com/nodejs/node/pull/34103#issuecomment-652002364
-      err.stack;
-
-      if (w && !w.errored) {
-        w.errored = err;
-      }
-      if (r && !r.errored) {
-        r.errored = err;
-      }
-    }
+    checkError(err, w, r);
 
     if (w) {
       w.closed = true;