third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.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/modules/websockets/DocumentWebSocketChannel.cpp

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

Patch Set: applied review comments 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/modules/websockets/DOMWebSocketTest.cpp ('k') | third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannelTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.cpp

diff --git a/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.cpp b/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.cpp

index 67688efcbfa9b0a448c0be345501727e236af9e1..29582758031eaa2e55397bd0bd4f0def712993a5 100644

--- a/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.cpp

+++ b/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.cpp

@@ -209,7 +209,10 @@ void DocumentWebSocketChannel::send(const DOMArrayBuffer& buffer, unsigned byteO

// buffer.slice copies its contents.

// FIXME: Reduce copy by sending the data immediately when we don't need to

// queue the data.

- m_messages.append(adoptPtr(new Message(buffer.slice(byteOffset, byteOffset + byteLength))));

+ RefPtr<DOMArrayBuffer> slice = buffer.sliceOrNull(byteOffset, byteOffset + byteLength);

+ // FIXME: Could we propagate a RangeError exception from here instead the following assert?

+ RELEASE_ASSERT(slice); // This is an out-of-memory condition.

+ m_messages.append(adoptPtr(new Message(slice.release())));

processSendQueue();

}