diff options
author | Kenta Moriuchi <moriken@kimamass.com> | 2024-01-04 13:12:38 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-04 09:42:38 +0530 |
commit | b2cd254c35b6b1b128beea0eacdb8e814d91e003 (patch) | |
tree | d55fa5910e32d8a664aff5b680e07debea93181e /ext/web/13_message_port.js | |
parent | 48556748577ba46db5f9212d14a0fcaa90d632f6 (diff) |
fix: strict type check for cross realms (#21669)
Deno v1.39 introduces `vm.runInNewContext`. This may cause problems when
using `Object.prototype.isPrototypeOf` to check built-in types.
```js
import vm from "node:vm";
const err = new Error();
const crossErr = vm.runInNewContext(`new Error()`);
console.assert( !(crossErr instanceof Error) );
console.assert( Object.getPrototypeOf(err) !== Object.getPrototypeOf(crossErr) );
```
This PR changes to check using internal slots solves them.
---
current:
```
> import vm from "node:vm";
undefined
> vm.runInNewContext(`new Error("message")`)
Error {}
> vm.runInNewContext(`new Date("2018-12-10T02:26:59.002Z")`)
Date {}
```
this PR:
```
> import vm from "node:vm";
undefined
> vm.runInNewContext(`new Error("message")`)
Error: message
at <anonymous>:1:1
> vm.runInNewContext(`new Date("2018-12-10T02:26:59.002Z")`)
2018-12-10T02:26:59.002Z
```
---------
Co-authored-by: Bartek IwaĆczuk <biwanczuk@gmail.com>
Diffstat (limited to 'ext/web/13_message_port.js')
-rw-r--r-- | ext/web/13_message_port.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/web/13_message_port.js b/ext/web/13_message_port.js index 71adae1f4..0fddfc2e8 100644 --- a/ext/web/13_message_port.js +++ b/ext/web/13_message_port.js @@ -18,9 +18,8 @@ import { setIsTrusted, } from "ext:deno_web/02_event.js"; import { isDetachedBuffer } from "ext:deno_web/06_streams.js"; -import DOMException from "ext:deno_web/01_dom_exception.js"; +import { DOMException } from "ext:deno_web/01_dom_exception.js"; const { - ArrayBufferPrototype, ArrayBufferPrototypeGetByteLength, ArrayPrototypeFilter, ArrayPrototypeIncludes, @@ -32,6 +31,9 @@ const { TypeError, } = primordials; const { + isArrayBuffer, +} = core; +const { op_message_port_recv_message, } = core.ensureFastOps(); @@ -282,7 +284,7 @@ function serializeJsMessageData(data, transferables) { const hostObjects = []; for (let i = 0, j = 0; i < transferables.length; i++) { const t = transferables[i]; - if (ObjectPrototypeIsPrototypeOf(ArrayBufferPrototype, t)) { + if (isArrayBuffer(t)) { if ( ArrayBufferPrototypeGetByteLength(t) === 0 && isDetachedBuffer(t) @@ -329,9 +331,7 @@ function serializeJsMessageData(data, transferables) { kind: "messagePort", data: id, }); - } else if ( - ObjectPrototypeIsPrototypeOf(ArrayBufferPrototype, transferable) - ) { + } else if (isArrayBuffer(transferable)) { ArrayPrototypePush(serializedTransferables, { kind: "arrayBuffer", data: transferredArrayBuffers[arrayBufferI], |