Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(659)

Unified Diff: third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp

Issue 2748933003: XMLHttpRequest: return null upon failing responseArrayBuffer allocation. (Closed)
Patch Set: Created 3 years, 9 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
Index: third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp
diff --git a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp
index eae72e1e03323bca9e761c5068e30b3531e7451d..6950ed16d1ca6cb2f821ebf0c2726c1f8d147508 100644
--- a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp
+++ b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp
@@ -250,7 +250,8 @@ XMLHttpRequest::XMLHttpRequest(
m_sameOriginRequest(true),
m_downloadingToFile(false),
m_responseTextOverflow(false),
- m_sendFlag(false) {}
+ m_sendFlag(false),
+ m_responseArrayBufferFailure(false) {}
XMLHttpRequest::~XMLHttpRequest() {}
@@ -385,14 +386,23 @@ DOMArrayBuffer* XMLHttpRequest::responseArrayBuffer() {
if (m_error || m_state != kDone)
return nullptr;
- if (!m_responseArrayBuffer) {
+ if (!m_responseArrayBuffer && !m_responseArrayBufferFailure) {
if (m_binaryResponseBuilder && m_binaryResponseBuilder->size()) {
- DOMArrayBuffer* buffer = DOMArrayBuffer::createUninitialized(
+ DOMArrayBuffer* buffer = DOMArrayBuffer::createUninitializedOrNull(
m_binaryResponseBuilder->size(), 1);
- m_binaryResponseBuilder->getAsBytes(
- buffer->data(), static_cast<size_t>(buffer->byteLength()));
- m_responseArrayBuffer = buffer;
+ if (buffer) {
+ m_binaryResponseBuilder->getAsBytes(
+ buffer->data(), static_cast<size_t>(buffer->byteLength()));
+ m_responseArrayBuffer = buffer;
+ }
+ // https://xhr.spec.whatwg.org/#arraybuffer-response allows clearing
+ // of the 'received bytes' payload when the response buffer allocation
+ // fails.
m_binaryResponseBuilder.clear();
+ // Mark allocation as failed; subsequent calls to the accessor must
+ // continue to report |null|.
+ //
+ m_responseArrayBufferFailure = !buffer;
} else {
m_responseArrayBuffer = DOMArrayBuffer::create(nullptr, 0);
}
@@ -1175,6 +1185,7 @@ void XMLHttpRequest::clearResponse() {
// this only when we clear the response holder variables above.
m_binaryResponseBuilder.clear();
m_responseArrayBuffer.clear();
+ m_responseArrayBufferFailure = false;
}
void XMLHttpRequest::clearRequest() {

Powered by Google App Engine
This is Rietveld 408576698