| Index: third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp
|
| diff --git a/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp b/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp
|
| index 56e64a840049706145e349836b810e615917dd9f..82cb911012ca3956b25e9a2e01825d4fea93f626 100644
|
| --- a/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp
|
| +++ b/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp
|
| @@ -431,7 +431,12 @@ void DOMWebSocket::send(DOMArrayBufferView* arrayBufferView, ExceptionState& exc
|
| Platform::current()->histogramEnumeration("WebCore.WebSocket.SendType", WebSocketSendTypeArrayBufferView, WebSocketSendTypeMax);
|
| ASSERT(m_channel);
|
| m_bufferedAmount += arrayBufferView->byteLength();
|
| - m_channel->send(*arrayBufferView->buffer(), arrayBufferView->byteOffset(), arrayBufferView->byteLength());
|
| + RefPtr<DOMArrayBuffer> buffer = arrayBufferView->bufferOrNull();
|
| + if (!buffer) {
|
| + exceptionState.throwRangeError("Out of memory.");
|
| + return;
|
| + }
|
| + m_channel->send(*buffer, arrayBufferView->byteOffset(), arrayBufferView->byteLength());
|
| }
|
|
|
| void DOMWebSocket::send(Blob* binaryData, ExceptionState& exceptionState)
|
| @@ -638,9 +643,13 @@ void DOMWebSocket::didReceiveBinaryMessage(PassOwnPtr<Vector<char>> binaryData)
|
| }
|
|
|
| case BinaryTypeArrayBuffer:
|
| - RefPtr<DOMArrayBuffer> arrayBuffer = DOMArrayBuffer::create(binaryData->data(), binaryData->size());
|
| + RefPtr<DOMArrayBuffer> arrayBuffer = DOMArrayBuffer::createOrNull(binaryData->data(), binaryData->size());
|
| Platform::current()->histogramEnumeration("WebCore.WebSocket.ReceiveType", WebSocketReceiveTypeArrayBuffer, WebSocketReceiveTypeMax);
|
| - m_eventQueue->dispatch(MessageEvent::create(arrayBuffer.release(), SecurityOrigin::create(m_url)->toString()));
|
| + // FIXME: This silently fails if array buffer allocation fails (out of memory).
|
| + // Is there something else we'd rather do?
|
| + if (arrayBuffer) {
|
| + m_eventQueue->dispatch(MessageEvent::create(arrayBuffer.release(), SecurityOrigin::create(m_url)->toString()));
|
| + }
|
| break;
|
| }
|
| }
|
|
|