Bug 1224643. Fix handling of U+0000 in URLSearchParams serialization.…

… r=baku
Manishearth · Nov 16, 2015 · f4152a3 · f4152a3
1 parent f50a8c0
commit f4152a3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/dom/base/URLSearchParams.cpp b/dom/base/URLSearchParams.cpp
@@ -253,8 +253,9 @@ namespace {
 void SerializeString(const nsCString& aInput, nsAString& aValue)
 {
   const unsigned char* p = (const unsigned char*) aInput.get();
+  const unsigned char* end = p + aInput.Length();
 
-  while (p && *p) {
+  while (p != end) {
     // ' ' to '+'
     if (*p == 0x20) {
       aValue.Append(0x2B);

diff --git a/dom/base/test/test_urlSearchParams.html b/dom/base/test/test_urlSearchParams.html
@@ -289,6 +289,17 @@
     runTest();
   }
 
+  function testZeroHandling() {
+    var u = new URLSearchParams;
+    u.set("a", "b\0c");
+    u.set("d\0e", "f");
+    u.set("g\0h", "i\0j");
+    is(u.toString(), "a=b%00c&d%00e=f&g%00h=i%00j",
+       "Should encode U+0000 as %00");
+
+    runTest();
+  }
+
   var tests = [
     testSimpleURLSearchParams,
     testCopyURLSearchParams,
@@ -301,7 +312,8 @@
     testDelete,
     testGetNULL,
     testSet,
-    testIterable
+    testIterable,
+    testZeroHandling,
   ];
 
   function runTest() {

diff --git a/testing/web-platform/meta/XMLHttpRequest/send-usp.html.ini b/testing/web-platform/meta/XMLHttpRequest/send-usp.html.ini
diff --git a/testing/web-platform/meta/XMLHttpRequest/send-usp.worker.js.ini b/testing/web-platform/meta/XMLHttpRequest/send-usp.worker.js.ini