Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 20c65b0

Browse filesBrowse files
targosdanielleadams
authored andcommitted
deps: V8: backport dfcf1e86fac0
Original commit message: [wasm] PostMessage of Memory.buffer should throw PostMessage of an ArrayBuffer that is not detachable should result in a DataCloneError. Bug: chromium:1170176, chromium:961059 Change-Id: Ib89bbc10d2b58918067fd1a90365cad10a0db9ec Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2653810 Reviewed-by: Adam Klein <adamk@chromium.org> Reviewed-by: Andreas Haas <ahaas@chromium.org> Commit-Queue: Deepti Gandluri <gdeepti@chromium.org> Cr-Commit-Position: refs/heads/master@{#72415} Refs: v8/v8@dfcf1e8 PR-URL: #37245 Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Vladimir de Turckheim <vlad2t@hotmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent a6053dc commit 20c65b0
Copy full SHA for 20c65b0

File tree

Expand file treeCollapse file tree

4 files changed

+15
-1
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

4 files changed

+15
-1
lines changed
Open diff view settings
Collapse file

‎common.gypi‎

Copy file name to clipboardExpand all lines: common.gypi
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# Reset this number to 0 on major V8 upgrades.
3838
# Increment by one for each non-official patch applied to deps/v8.
39-
'v8_embedder_string': '-node.23',
39+
'v8_embedder_string': '-node.24',
4040

4141
##### V8 defaults for Node.js #####
4242

Collapse file

‎deps/v8/src/common/message-template.h‎

Copy file name to clipboardExpand all lines: deps/v8/src/common/message-template.h
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -573,6 +573,8 @@ namespace internal {
573573
T(DataCloneErrorOutOfMemory, "Data cannot be cloned, out of memory.") \
574574
T(DataCloneErrorDetachedArrayBuffer, \
575575
"An ArrayBuffer is detached and could not be cloned.") \
576+
T(DataCloneErrorNonDetachableArrayBuffer, \
577+
"ArrayBuffer is not detachable and could not be cloned.") \
576578
T(DataCloneErrorSharedArrayBufferTransferred, \
577579
"A SharedArrayBuffer could not be cloned. SharedArrayBuffer must not be " \
578580
"transferred.") \
Collapse file

‎deps/v8/src/objects/value-serializer.cc‎

Copy file name to clipboardExpand all lines: deps/v8/src/objects/value-serializer.cc
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -860,6 +860,11 @@ Maybe<bool> ValueSerializer::WriteJSArrayBuffer(
860860
WriteVarint(index.FromJust());
861861
return ThrowIfOutOfMemory();
862862
}
863+
if (!array_buffer->is_detachable()) {
864+
ThrowDataCloneError(
865+
MessageTemplate::kDataCloneErrorNonDetachableArrayBuffer);
866+
return Nothing<bool>();
867+
}
863868

864869
uint32_t* transfer_entry = array_buffer_transfer_map_.Find(array_buffer);
865870
if (transfer_entry) {
Collapse file

‎deps/v8/test/mjsunit/wasm/worker-memory.js‎

Copy file name to clipboardExpand all lines: deps/v8/test/mjsunit/wasm/worker-memory.js
+7Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@
1111
assertThrows(() => worker.postMessage(memory), Error);
1212
})();
1313

14+
(function TestPostMessageUnsharedMemoryBuffer() {
15+
let worker = new Worker('', {type: 'string'});
16+
let memory = new WebAssembly.Memory({initial: 1, maximum: 2});
17+
18+
assertThrows(() => worker.postMessage(memory.buffer), Error);
19+
})();
20+
1421
// Can't use assert in a worker.
1522
let workerHelpers =
1623
`function assertTrue(value, msg) {

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.