third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp - Issue 1414553002: Fix out-of-memory crashes related to ArrayBuffer allocation

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp

Issue 1414553002: Fix out-of-memory crashes related to ArrayBuffer allocation Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Reverting some behavior changes Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp ('K') | « third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp ('k') | third_party/WebKit/Source/bindings/core/v8/V8Initializer.cpp » ('j') | third_party/WebKit/Source/bindings/core/v8/V8Initializer.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp

diff --git a/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp b/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp

index b5e74ab3befa74326948a3eca0a09c18721ff580..4083b49715182c15708fba2a1cadad545cf57914 100644

--- a/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp

+++ b/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp

@@ -159,8 +159,8 @@ PassOwnPtr<SerializedScriptValue::ArrayBufferContentsArray> SerializedScriptValu

isNeuterable &= bufferHandles[j]->IsNeuterable();

RefPtr<DOMArrayBufferBase> toTransfer = arrayBuffers[i];

if (!isNeuterable)

- toTransfer = DOMArrayBuffer::create(arrayBuffers[i]->buffer());

- bool result = toTransfer->transfer(contents->at(i));

+ toTransfer = DOMArrayBuffer::createOrNull(arrayBuffers[i]->buffer());

+ bool result = toTransfer ? toTransfer->transfer(contents->at(i)) : false;

if (!result) {

exceptionState.throwDOMException(DataCloneError, "ArrayBuffer at index " + String::number(i) + " could not be transferred.");

return nullptr;