Changeset 158333 in webkit

Timestamp:

Oct 30, 2013 5:32:58 PM (10 years ago)

Author:

ap@apple.com

Message:

XHR.response is null when requesting empty file as arraybuffer
​https://bugs.webkit.org/show_bug.cgi?id=123457

Source/WebCore:

Reviewed by Sam Weinig.

Test: http/tests/xmlhttprequest/response-empty-arraybuffer.html

• xml/XMLHttpRequest.cpp: (WebCore::XMLHttpRequest::responseArrayBuffer): Don't do this.

LayoutTests:

Based on a Blink test by ​yusukesuzuki@chromium.org.

Reviewed by Sam Weinig.

Failures in expected results appear to mean that Blink caches XHR responses in more
cases. It's not directly related to the patch.

• http/tests/xmlhttprequest/response-empty-arraybuffer-expected.txt: Added.
• http/tests/xmlhttprequest/response-empty-arraybuffer.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/xmlhttprequest/response-empty-arraybuffer-expected.txt (added)
• LayoutTests/http/tests/xmlhttprequest/response-empty-arraybuffer.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/xml/XMLHttpRequest.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-10-30  Alexey Proskuryakov  <ap@apple.com>
+
+        XHR.response is null when requesting empty file as arraybuffer
+        https://bugs.webkit.org/show_bug.cgi?id=123457
+
+        Based on a Blink test by yusukesuzuki@chromium.org.
+
+        Reviewed by Sam Weinig.
+
+        Failures in expected results appear to mean that Blink caches XHR responses in more
+        cases. It's not directly related to the patch.
+
+        * http/tests/xmlhttprequest/response-empty-arraybuffer-expected.txt: Added.
+        * http/tests/xmlhttprequest/response-empty-arraybuffer.html: Added.
+
 2013-10-30  Samuel White  <samuel_white@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-30  Alexey Proskuryakov  <ap@apple.com>
+
+        XHR.response is null when requesting empty file as arraybuffer
+        https://bugs.webkit.org/show_bug.cgi?id=123457
+
+        Reviewed by Sam Weinig.
+
+        Test: http/tests/xmlhttprequest/response-empty-arraybuffer.html
+
+        * xml/XMLHttpRequest.cpp: (WebCore::XMLHttpRequest::responseArrayBuffer): Don't do this.
+
 2013-10-30  Samuel White  <samuel_white@apple.com>
 

trunk/Source/WebCore/xml/XMLHttpRequest.cpp

@@ -326 +326 @@
         return 0;
 
-    if (!m_responseArrayBuffer.get() && m_binaryResponseBuilder.get() && m_binaryResponseBuilder->size() > 0) {
-        m_responseArrayBuffer = ArrayBuffer::create(const_cast<char*>(m_binaryResponseBuilder->data()), static_cast<unsigned>(m_binaryResponseBuilder->size()));
+    if (!m_responseArrayBuffer) {
+        if (m_binaryResponseBuilder)
+            m_responseArrayBuffer = ArrayBuffer::create(const_cast<char*>(m_binaryResponseBuilder->data()), static_cast<unsigned>(m_binaryResponseBuilder->size()));
+        else
+            m_responseArrayBuffer = ArrayBuffer::create(nullptr, 0);
         m_binaryResponseBuilder.clear();
     }