lib: tighten AbortSignal.prototype.throwIfAborted implementation

aduh95 · danielleadams · commit 2b80d19c06f1 · 2023-04-03T07:43:52.000-04:00
PR-URL: #46521 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
diff --git a/lib/internal/abort_controller.js b/lib/internal/abort_controller.js
@@ -150,8 +150,9 @@ class AbortSignal extends EventTarget {
   }
 
   throwIfAborted() {
-    if (this.aborted) {
-      throw this.reason;
+    validateThisAbortSignal(this);
+    if (this[kAborted]) {
+      throw this[kReason];
     }
   }
 
diff --git a/test/parallel/test-abortcontroller.js b/test/parallel/test-abortcontroller.js
@@ -254,3 +254,20 @@ const { setTimeout: sleep } = require('timers/promises');
   const ac = new AbortController();
   ac.signal.throwIfAborted();
 }
+
+{
+  const originalDesc = Reflect.getOwnPropertyDescriptor(AbortSignal.prototype, 'aborted');
+  const actualReason = new Error();
+  Reflect.defineProperty(AbortSignal.prototype, 'aborted', { value: false });
+  throws(() => AbortSignal.abort(actualReason).throwIfAborted(), actualReason);
+  Reflect.defineProperty(AbortSignal.prototype, 'aborted', originalDesc);
+}
+
+{
+  const originalDesc = Reflect.getOwnPropertyDescriptor(AbortSignal.prototype, 'reason');
+  const actualReason = new Error();
+  const fakeExcuse = new Error();
+  Reflect.defineProperty(AbortSignal.prototype, 'reason', { value: fakeExcuse });
+  throws(() => AbortSignal.abort(actualReason).throwIfAborted(), actualReason);
+  Reflect.defineProperty(AbortSignal.prototype, 'reason', originalDesc);
+}

Original file line number	Diff line number	Diff line change
`@@ -150,8 +150,9 @@ class AbortSignal extends EventTarget {`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`throwIfAborted() {`
`153`		`- if (this.aborted) {`
`154`		`- throw this.reason;`
	`153`	`+ validateThisAbortSignal(this);`
	`154`	`+ if (this[kAborted]) {`
	`155`	`+ throw this[kReason];`
`155`	`156`	`}`
`156`	`157`	`}`
`157`	`158`