nodejs
diff --git a/Collapse file
‎lib/internal/encoding.js‎
Copy file name to clipboardExpand all lines: lib/internal/encoding.js
+18-4Lines changed: 18 additions & 4 deletions b/Collapse file
‎lib/internal/encoding.js‎
Copy file name to clipboardExpand all lines: lib/internal/encoding.js
+18-4Lines changed: 18 additions & 4 deletions
diff --git a/Collapse file
‎test/parallel/test-whatwg-encoding-custom-textdecoder.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-whatwg-encoding-custom-textdecoder.js
+7Lines changed: 7 additions & 0 deletions b/Collapse file
‎test/parallel/test-whatwg-encoding-custom-textdecoder.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-whatwg-encoding-custom-textdecoder.js
+7Lines changed: 7 additions & 0 deletions
diff --git a/Collapse file
‎test/wpt/status/encoding.json‎
Copy file name to clipboardExpand all lines: test/wpt/status/encoding.json
+1-6Lines changed: 1 addition & 6 deletions b/Collapse file
‎test/wpt/status/encoding.json‎
Copy file name to clipboardExpand all lines: test/wpt/status/encoding.json
+1-6Lines changed: 1 addition & 6 deletions
@@ -412,7 +412,13 @@ function makeTextDecoderICU() {
     decode(input = empty, options = kEmptyObject) {
       validateDecoder(this);
       if (isAnyArrayBuffer(input)) {
-        input = lazyBuffer().from(input);
+        try {
+          input = lazyBuffer().from(input);
+        } catch {
+          // If the buffer is detached,
+          // use an empty Uint8Array to avoid TypeError
+          input = empty;
+        }
       } else if (!isArrayBufferView(input)) {
         throw new ERR_INVALID_ARG_TYPE('input',
                                        ['ArrayBuffer', 'ArrayBufferView'],
@@ -485,10 +491,18 @@ function makeTextDecoderJS() {
     decode(input = empty, options = kEmptyObject) {
       validateDecoder(this);
       if (isAnyArrayBuffer(input)) {
-        input = lazyBuffer().from(input);
+        try {
+          input = lazyBuffer().from(input);
+        } catch {
+          input = empty;
+        }
       } else if (isArrayBufferView(input)) {
-        input = lazyBuffer().from(input.buffer, input.byteOffset,
-                                  input.byteLength);
+        try {
+          input = lazyBuffer().from(input.buffer, input.byteOffset,
+                                    input.byteLength);
+        } catch {
+          input = empty;
+        }
       } else {
         throw new ERR_INVALID_ARG_TYPE('input',
                                        ['ArrayBuffer', 'ArrayBufferView'],
 
@@ -211,3 +211,10 @@ if (common.hasIntl) {
     assert.strictEqual(e.code, 'ERR_ENCODING_NOT_SUPPORTED');
   }
 }
+
+{
+  const buffer = new ArrayBuffer(1);
+  new MessageChannel().port1.postMessage(buffer, [buffer]); // buffer is detached
+  const decoder = new TextDecoder();
+  assert.strictEqual(decoder.decode(buffer), '');
+}
@@ -61,12 +61,7 @@
     "requires": ["small-icu"]
   },
   "streams/decode-utf8.any.js": {
-    "requires": ["small-icu"],
-    "fail": {
-      "expected": [
-        "decoding a transferred ArrayBuffer chunk should give no output"
-      ]
-    }
+    "requires": ["small-icu"]
   },
   "streams/decode-bad-chunks.any.js": {
     "fail": {
Original file line number	Diff line number	Diff line change
`@@ -211,3 +211,10 @@ if (common.hasIntl) {`
`211`	`211`	`assert.strictEqual(e.code, 'ERR_ENCODING_NOT_SUPPORTED');`
`212`	`212`	`}`
`213`	`213`	`}`
	`214`	`+`
	`215`	`+{`
	`216`	`+ const buffer = new ArrayBuffer(1);`
	`217`	`+ new MessageChannel().port1.postMessage(buffer, [buffer]); // buffer is detached`
	`218`	`+ const decoder = new TextDecoder();`
	`219`	`+ assert.strictEqual(decoder.decode(buffer), '');`
	`220`	`+}`