Fix xhr.abort() during XHR readystatechange

Closes #1808.
jsdom · Apr 29, 2017 · e79e9a1 · e79e9a1
1 parent 270f288
commit e79e9a1
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/lib/jsdom/living/xmlhttprequest.js b/lib/jsdom/living/xmlhttprequest.js
@@ -924,6 +924,11 @@ module.exports = function createXMLHttpRequest(window) {
     properties.responseXMLCache = null;
     readyStateChange(xhr, XMLHttpRequest.HEADERS_RECEIVED);
 
+    if (!properties.client) {
+      // The request was aborted in reaction to the readystatechange event.
+      return;
+    }
+
     // Can't use the client since the client gets the post-ungzipping bytes (which can be greater than the
     // Content-Length).
     response.on("data", chunk => {

diff --git a/test/web-platform-tests/to-upstream.js b/test/web-platform-tests/to-upstream.js
@@ -104,10 +104,11 @@ describe("Local tests in Web Platform Test format (to-upstream)", () => {
     "html/webappapis/timers/arguments.html",
     "html/webappapis/timers/errors.html",
     "html/webappapis/timers/settimeout-setinterval-handles.html",
+    "XMLHttpRequest/abort-during-readystatechange.html",
     "XMLHttpRequest/formdata-constructor.html",
     "XMLHttpRequest/formdata-set-blob.html",
-    "XMLHttpRequest/thrown-error-in-events.html",
-    "XMLHttpRequest/send-authentication-cors-post.htm"
+    "XMLHttpRequest/send-authentication-cors-post.htm",
+    "XMLHttpRequest/thrown-error-in-events.html"
   ]
   .forEach(runWebPlatformTest);
 });
diff --git a/test/web-platform-tests/to-upstream/XMLHttpRequest/abort-during-readystatechange.html b/test/web-platform-tests/to-upstream/XMLHttpRequest/abort-during-readystatechange.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<title>abort() during readystatechange should work fine</title>
+<link rel="author" title="Domenic Denicola" href="mailto:d@domenic.me">
+<link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script>
+"use strict";
+
+const xhr = new XMLHttpRequest();
+
+// In jsdom's implementation, this would cause a crash, as after firing readystatechange for HEADERS_RECEIVED, it would
+// try to manipulate internal state. But that internal state got cleared during abort(). So jsdom needed to be modified
+// to check if that internal state had gone away as a result of firing readystatechange, and if so, bail out.
+
+xhr.addEventListener("readystatechange", () => {
+  if (xhr.readyState === xhr.HEADERS_RECEIVED) {
+    xhr.abort();
+  } else if (xhr.readyState === xhr.DONE) {
+    done();
+  }
+});
+
+xhr.open("GET", "/common/blank.html");
+xhr.send();
+
+</script>