third_party/WebKit/Source/core/fileapi/FileReaderLoader.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/core/fileapi/FileReaderLoader.cpp

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

Patch Set: rebase+more tweaks Created 5 years, 1 month ago

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

Jump to:

Index: third_party/WebKit/Source/core/fileapi/FileReaderLoader.cpp

diff --git a/third_party/WebKit/Source/core/fileapi/FileReaderLoader.cpp b/third_party/WebKit/Source/core/fileapi/FileReaderLoader.cpp

index c94cacd8d597499d2f42c602f25111d4347c3f8d..d48481d7d87613d5358fb59e118f6bc798b0fd99 100644

--- a/third_party/WebKit/Source/core/fileapi/FileReaderLoader.cpp

+++ b/third_party/WebKit/Source/core/fileapi/FileReaderLoader.cpp

@@ -307,7 +307,7 @@ FileError::ErrorCode FileReaderLoader::httpStatusCodeToErrorCode(int httpStatusC

}

-PassRefPtr<DOMArrayBuffer> FileReaderLoader::arrayBufferResult() const

+PassRefPtr<DOMArrayBuffer> FileReaderLoader::arrayBufferResultOrNull() const

{

ASSERT(m_readType == ReadAsArrayBuffer);

@@ -315,7 +315,7 @@ PassRefPtr<DOMArrayBuffer> FileReaderLoader::arrayBufferResult() const

if (!m_rawData || m_errorCode)

return nullptr;

- return DOMArrayBuffer::create(m_rawData->toArrayBuffer());

+ return DOMArrayBuffer::createOrNull(m_rawData->toArrayBuffer());

}

String FileReaderLoader::stringResult()