lib: clean after the cancel algorithm throw error

PR-URL: #41366 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Robert Nagy <[email protected]>
nodejs · Apr 24, 2022 · 5c05835 · 5c05835
1 parent 8d646af
commit 5c05835
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 3 deletions.
diff --git a/lib/internal/webstreams/readablestream.js b/lib/internal/webstreams/readablestream.js
@@ -1911,9 +1911,12 @@ function readableStreamDefaultControllerError(controller, error) {
 
 function readableStreamDefaultControllerCancelSteps(controller, reason) {
   resetQueue(controller);
-  const result = controller[kState].cancelAlgorithm(reason);
-  readableStreamDefaultControllerClearAlgorithms(controller);
-  return result;
+  try {
+    const result = controller[kState].cancelAlgorithm(reason);
+    return result;
+  } finally {
+    readableStreamDefaultControllerClearAlgorithms(controller);
+  }
 }
 
 function readableStreamDefaultControllerPullSteps(controller, readRequest) {

diff --git a/test/parallel/test-whatwg-readablestream.js b/test/parallel/test-whatwg-readablestream.js
@@ -80,6 +80,36 @@ const {
   assert(r.locked);
 }
 
+{
+  // Throw error and return rejected promise in `cancel()` method
+  // would execute same cleanup code
+  const r1 = new ReadableStream({
+    cancel: () => {
+      return Promise.reject('Cancel Error');
+    },
+  });
+  r1.cancel().finally(common.mustCall(() => {
+    const controllerState = r1[kState].controller[kState];
+
+    assert.strictEqual(controllerState.pullAlgorithm, undefined);
+    assert.strictEqual(controllerState.cancelAlgorithm, undefined);
+    assert.strictEqual(controllerState.sizeAlgorithm, undefined);
+  })).catch(() => {});
+
+  const r2 = new ReadableStream({
+    cancel() {
+      throw new Error('Cancel Error');
+    }
+  });
+  r2.cancel().finally(common.mustCall(() => {
+    const controllerState = r2[kState].controller[kState];
+
+    assert.strictEqual(controllerState.pullAlgorithm, undefined);
+    assert.strictEqual(controllerState.cancelAlgorithm, undefined);
+    assert.strictEqual(controllerState.sizeAlgorithm, undefined);
+  })).catch(() => {});
+}
+
 {
   const source = {
     start: common.mustCall((controller) => {