Backed out changeset a858e4411532 (bug 1566595) for causing Windows MinGW builds bustages CLOSED TREE

SV-ACiure · SV-ACiure · commit 98278afa46f8 · 2019-07-22T21:39:08.000+03:00
diff --git a/dom/base/test/bug457746.sjs b/dom/base/test/bug457746.sjs
@@ -6,6 +6,6 @@ function handleRequest(request, response)
       .createInstance(Components.interfaces.nsIBinaryOutputStream);
   bos.setOutputStream(response.bodyOutputStream);
 
-  bos.writeByteArray(body);
+  bos.writeByteArray(body, body.length);
 }
 
diff --git a/dom/events/DataTransfer.cpp b/dom/events/DataTransfer.cpp
@@ -7,7 +7,6 @@
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/BasicEvents.h"
 #include "mozilla/CheckedInt.h"
-#include "mozilla/Span.h"
 
 #include "DataTransfer.h"
 
@@ -1105,12 +1104,8 @@ already_AddRefed<nsITransferable> DataTransfer::GetTransferable(
                 totalCustomLength = 0;
                 continue;
               }
-              MOZ_ASSERT(formatLength.isValid() &&
-                             formatLength.value() ==
-                                 type.Length() * sizeof(nsString::char_type),
-                         "Why is formatLength off?");
-              rv = stream->WriteBytes(
-                  AsBytes(MakeSpan(type.get(), type.Length())));
+              rv = stream->WriteBytes((const char*)type.get(),
+                                      formatLength.value());
               if (NS_WARN_IF(NS_FAILED(rv))) {
                 totalCustomLength = 0;
                 continue;
@@ -1120,13 +1115,7 @@ already_AddRefed<nsITransferable> DataTransfer::GetTransferable(
                 totalCustomLength = 0;
                 continue;
               }
-              // XXXbz it's not obvious to me that lengthInBytes is the actual
-              // length of "data" if the variant contained an nsISupportsString
-              // as VTYPE_INTERFACE, say.  We used lengthInBytes above for
-              // sizing, so just keep doing that.
-              rv = stream->WriteBytes(MakeSpan(
-                  reinterpret_cast<const uint8_t*>(data.get()), lengthInBytes));
-              ;
+              rv = stream->WriteBytes((const char*)data.get(), lengthInBytes);
               if (NS_WARN_IF(NS_FAILED(rv))) {
                 totalCustomLength = 0;
                 continue;
diff --git a/dom/ipc/tests/blob_verify.sjs b/dom/ipc/tests/blob_verify.sjs
@@ -15,6 +15,6 @@ function handleRequest(request, response) {
   var bos = new BinaryOutputStream(response.bodyOutputStream);
 
   response.processAsync();
-  bos.writeByteArray(bodyBytes);
+  bos.writeByteArray(bodyBytes, bodyBytes.length);
   response.finish();
 }
diff --git a/dom/serviceworkers/test/fetch/deliver-gzip.sjs b/dom/serviceworkers/test/fetch/deliver-gzip.sjs
@@ -13,5 +13,5 @@ function handleRequest(request, response) {
       .createInstance(Components.interfaces.nsIBinaryOutputStream);
   bos.setOutputStream(response.bodyOutputStream);
 
-  bos.writeByteArray(bytes);
+  bos.writeByteArray(bytes, bytes.length);
 }
diff --git a/dom/xhr/tests/temporaryFileBlob.sjs b/dom/xhr/tests/temporaryFileBlob.sjs
@@ -21,10 +21,10 @@ function handleRequest(request, response) {
   response.processAsync();
 
   var part = bodyBytes.splice(0, 256);
-  bos.writeByteArray(part);
+  bos.writeByteArray(part, part.length);
 
   response.timer1 = new Timer(function(timer) {
-    bos.writeByteArray(bodyBytes);
+    bos.writeByteArray(bodyBytes, bodyBytes.length);
   }, 1000, Components.interfaces.nsITimer.TYPE_ONE_SHOT);
 
   response.timer2 = new Timer(function(timer) {
diff --git a/image/test/reftest/generic/check-header.sjs b/image/test/reftest/generic/check-header.sjs
@@ -62,7 +62,7 @@ function handleRequest(request, response)
     response.setHeader("Content-Type", "image/png", false);
 
     var stream = new BinaryOutputStream(response.bodyOutputStream);
-    stream.writeByteArray(IMAGE_DATA);
+    stream.writeByteArray(IMAGE_DATA, IMAGE_DATA.length);
   }
   else
   {
diff --git a/image/test/unit/test_imgtools.js b/image/test/unit/test_imgtools.js
@@ -25,7 +25,7 @@ function dumpToFile(aData) {
   );
   bos.setOutputStream(outputStream);
 
-  bos.writeByteArray(aData);
+  bos.writeByteArray(aData, aData.length);
 
   outputStream.close();
 }
diff --git a/intl/uconv/tests/unit/test_charset_conversion.js b/intl/uconv/tests/unit/test_charset_conversion.js
@@ -89,7 +89,7 @@ function test_cross_conversion()
     while ((av = fin.available()) > 0)
     {
       var data = fin.readByteArray(av);
-      bos.writeByteArray(data);
+      bos.writeByteArray(data, data.length);
     }
     fin.close();
     bos.close();
diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
@@ -973,8 +973,7 @@ static nsresult WriteScriptOrFunction(nsIObjectOutputStream* stream,
   }
   rv = stream->Write32(size);
   if (NS_SUCCEEDED(rv)) {
-    // Ideally we could just pass "buffer" here.  See bug 1566574.
-    rv = stream->WriteBytes(MakeSpan(buffer.begin(), size));
+    rv = stream->WriteBytes(reinterpret_cast<char*>(buffer.begin()), size);
   }
 
   return rv;
diff --git a/layout/reftests/backgrounds/background-referrer.sjs b/layout/reftests/backgrounds/background-referrer.sjs
@@ -62,7 +62,7 @@ function handleRequest(request, response)
     response.setHeader("Content-Type", "image/png", false);
 
     var stream = new BinaryOutputStream(response.bodyOutputStream);
-    stream.writeByteArray(IMAGE_DATA);
+    stream.writeByteArray(IMAGE_DATA, IMAGE_DATA.length);
   }
   else
   {
diff --git a/layout/reftests/backgrounds/delay-image-response.sjs b/layout/reftests/backgrounds/delay-image-response.sjs
@@ -43,7 +43,7 @@ function handleRequest(request, response) {
 
   function imageWrite() {
     var stream = new BinaryOutputStream(response.bodyOutputStream);
-    stream.writeByteArray(IMAGE_DATA);
+    stream.writeByteArray(IMAGE_DATA, IMAGE_DATA.length);
   }
 
   // If there is no delay, we write the image and leave.
diff --git a/layout/reftests/font-face/bug-1481905-cancel-load.sjs b/layout/reftests/font-face/bug-1481905-cancel-load.sjs
@@ -205,7 +205,7 @@ function handleRequest(request, response) {
 
   function fontWrite(data) {
     var stream = new BinaryOutputStream(response.bodyOutputStream);
-    stream.writeByteArray(data);
+    stream.writeByteArray(data, data.length);
   }
 
   const nsITimer = Components.interfaces.nsITimer;
diff --git a/layout/reftests/fonts/Chunkfive.sjs b/layout/reftests/fonts/Chunkfive.sjs
@@ -19,7 +19,7 @@ function handleRequest(request, response)
   response.setHeader("Cache-Control", "no-cache", false);
 
   var stream = new BinaryOutputStream(response.bodyOutputStream);
-  stream.writeByteArray(FONT_DATA);
+  stream.writeByteArray(FONT_DATA, FONT_DATA.length);
 }
 
 /**
diff --git a/layout/reftests/fonts/markfonts-delay.sjs b/layout/reftests/fonts/markfonts-delay.sjs
@@ -37,7 +37,7 @@ function handleRequest(request, response) {
 
   function fontWrite(data) {
     var stream = new BinaryOutputStream(response.bodyOutputStream);
-    stream.writeByteArray(data);
+    stream.writeByteArray(data, data.length);
   }
 
   var f;
diff --git a/layout/style/test/redundant_font_download.sjs b/layout/style/test/redundant_font_download.sjs
@@ -39,11 +39,11 @@ function handleRequest(request, response)
   if (query["q"] == "init") {
     log = "init"; // initialize the log, and return a PNG image
     response.setHeader("Content-Type", "image/png", false);
-    stream.writeByteArray(RED_SQUARE);
+    stream.writeByteArray(RED_SQUARE, RED_SQUARE.length);
   } else if (query["q"] == "image") {
     log = log + ";" + query["q"];
     response.setHeader("Content-Type", "image/png", false);
-    stream.writeByteArray(RED_SQUARE);
+    stream.writeByteArray(RED_SQUARE, RED_SQUARE.length);
   } else if (query["q"] == "font") {
     log = log + ";" + query["q"];
     // we don't provide a real font; that's ok, OTS will just reject it
diff --git a/netwerk/test/httpserver/httpd.js b/netwerk/test/httpserver/httpd.js
@@ -1532,10 +1532,9 @@ RequestReader.prototype = {
             " excess=" +
             (data.length - count)
         );
-        data.length = count;
 
         var bos = new BinaryOutputStream(this._metadata._bodyOutputStream);
-        bos.writeByteArray(data);
+        bos.writeByteArray(data, count);
         this._contentLength -= count;
       }
 
@@ -2862,7 +2861,7 @@ ServerHandler.prototype = {
                 ", expected " +
                 chunkSize
             );
-            output.writeByteArray(data);
+            output.writeByteArray(data, data.length);
             if (count === 0) {
               fis.close();
               response.finish();
diff --git a/netwerk/test/httpserver/test/test_async_response_sending.js b/netwerk/test/httpserver/test/test_async_response_sending.js
@@ -867,9 +867,19 @@ function CustomPipe(name) {
     //
     // see nsIBinaryOutputStream.writeByteArray
     //
-    writeByteArray: function writeByteArray(bytes) {
-      dumpn(`*** [${this.name}].writeByteArray([${bytes}])`);
+    writeByteArray: function writeByteArray(bytes, length) {
+      dumpn(
+        "*** [" +
+          this.name +
+          "].writeByteArray" +
+          "([" +
+          bytes +
+          "], " +
+          length +
+          ")"
+      );
 
+      Assert.equal(bytes.length, length, "sanity");
       if (!Components.isSuccessCode(self._status)) {
         throw self._status;
       }
@@ -880,12 +890,12 @@ function CustomPipe(name) {
         "writeByteArray can't support specified-length writes"
       );
 
-      if (this._writable < bytes.length) {
+      if (this._writable < length) {
         throw Cr.NS_BASE_STREAM_WOULD_BLOCK;
       }
 
       self._data.push.apply(self._data, bytes);
-      this._writable -= bytes.length;
+      this._writable -= length;
 
       if (
         input._readable === Infinity &&
@@ -1154,7 +1164,7 @@ CopyTest.prototype = {
 
       try {
         self._copyableDataStream.makeWritable(bytes.length);
-        self._copyableDataStream.writeByteArray(bytes);
+        self._copyableDataStream.writeByteArray(bytes, bytes.length);
       } finally {
         self._stageNextTask();
       }
diff --git a/netwerk/test/httpserver/test/test_processasync.js b/netwerk/test/httpserver/test/test_processasync.js
@@ -240,7 +240,7 @@ function handleAsyncOrdering(request, response) {
       }
 
       try {
-        out.writeByteArray(data);
+        out.writeByteArray(data, data.length);
         step();
       } catch (e) {
         try {
diff --git a/netwerk/test/unit/test_bug1279246.js b/netwerk/test/unit/test_bug1279246.js
@@ -91,6 +91,6 @@ function handler(metadata, response) {
   bos.setOutputStream(response.bodyOutputStream);
 
   response.processAsync();
-  bos.writeByteArray(responseBody);
+  bos.writeByteArray(responseBody, responseBody.length);
   response.finish();
 }
diff --git a/netwerk/test/unit/test_content_encoding_gzip.js b/netwerk/test/unit/test_content_encoding_gzip.js
@@ -203,6 +203,6 @@ function handler(metadata, response) {
   bos.setOutputStream(response.bodyOutputStream);
 
   response.processAsync();
-  bos.writeByteArray(tests[index].body);
+  bos.writeByteArray(tests[index].body, tests[index].body.length);
   response.finish();
 }
diff --git a/netwerk/test/unit/test_gzipped_206.js b/netwerk/test/unit/test_gzipped_206.js
@@ -118,7 +118,7 @@ function cachedHandler(metadata, response) {
   bos.setOutputStream(response.bodyOutputStream);
 
   response.processAsync();
-  bos.writeByteArray(body);
+  bos.writeByteArray(body, body.length);
   response.finish();
 }
 
diff --git a/netwerk/test/unit/test_range_requests.js b/netwerk/test/unit/test_range_requests.js
@@ -261,7 +261,7 @@ function handler_4(metadata, response) {
       );
       bos.setOutputStream(response.bodyOutputStream);
       response.processAsync();
-      bos.writeByteArray(body);
+      bos.writeByteArray(body, body.length);
       response.finish();
       break;
     case 1:
diff --git a/netwerk/test/unit/test_reply_without_content_type.js b/netwerk/test/unit/test_reply_without_content_type.js
@@ -129,7 +129,7 @@ function serverHandler_GZip(metadata, response) {
     Ci.nsIBinaryOutputStream
   );
   bos.setOutputStream(response.bodyOutputStream);
-  bos.writeByteArray(httpbodyGZip);
+  bos.writeByteArray(httpbodyGZip, httpbodyGZip.length);
   if (dbg) {
     print("============== serverHandler GZip: out");
   }
diff --git a/security/manager/ssl/nsNSSCertificate.cpp b/security/manager/ssl/nsNSSCertificate.cpp
@@ -13,7 +13,6 @@
 #include "mozilla/Base64.h"
 #include "mozilla/Casting.h"
 #include "mozilla/NotNull.h"
-#include "mozilla/Span.h"
 #include "mozilla/Unused.h"
 #include "nsArray.h"
 #include "nsCOMPtr.h"
@@ -1195,7 +1194,7 @@ nsNSSCertificate::Write(nsIObjectOutputStream* aStream) {
   if (NS_FAILED(rv)) {
     return rv;
   }
-  return aStream->WriteBytes(AsBytes(MakeSpan(mCert->derCert.data, mCert->derCert.len)));
+  return aStream->WriteByteArray(mCert->derCert.data, mCert->derCert.len);
 }
 
 NS_IMETHODIMP
diff --git a/toolkit/components/downloads/test/unit/common_test_Download.js b/toolkit/components/downloads/test/unit/common_test_Download.js
@@ -1809,7 +1809,10 @@ add_task(async function test_with_content_encoding() {
     );
 
     let bos = new BinaryOutputStream(aResponse.bodyOutputStream);
-    bos.writeByteArray(TEST_DATA_SHORT_GZIP_ENCODED);
+    bos.writeByteArray(
+      TEST_DATA_SHORT_GZIP_ENCODED,
+      TEST_DATA_SHORT_GZIP_ENCODED.length
+    );
   });
 
   let download = await promiseStartDownload(sourceUrl);
@@ -1846,7 +1849,10 @@ add_task(async function test_with_content_encoding_ignore_extension() {
     );
 
     let bos = new BinaryOutputStream(aResponse.bodyOutputStream);
-    bos.writeByteArray(TEST_DATA_SHORT_GZIP_ENCODED);
+    bos.writeByteArray(
+      TEST_DATA_SHORT_GZIP_ENCODED,
+      TEST_DATA_SHORT_GZIP_ENCODED.length
+    );
   });
 
   let download = await promiseStartDownload(sourceUrl);
diff --git a/toolkit/components/downloads/test/unit/head.js b/toolkit/components/downloads/test/unit/head.js
@@ -870,11 +870,17 @@ add_task(function test_common_initialize() {
       );
 
       let bos = new BinaryOutputStream(aResponse.bodyOutputStream);
-      bos.writeByteArray(TEST_DATA_SHORT_GZIP_ENCODED_FIRST);
+      bos.writeByteArray(
+        TEST_DATA_SHORT_GZIP_ENCODED_FIRST,
+        TEST_DATA_SHORT_GZIP_ENCODED_FIRST.length
+      );
     },
     function secondPart(aRequest, aResponse) {
       let bos = new BinaryOutputStream(aResponse.bodyOutputStream);
-      bos.writeByteArray(TEST_DATA_SHORT_GZIP_ENCODED_SECOND);
+      bos.writeByteArray(
+        TEST_DATA_SHORT_GZIP_ENCODED_SECOND,
+        TEST_DATA_SHORT_GZIP_ENCODED_SECOND.length
+      );
     }
   );
 
diff --git a/toolkit/components/mediasniffer/test/unit/test_mediasniffer_ext.js b/toolkit/components/mediasniffer/test/unit/test_mediasniffer_ext.js
@@ -111,7 +111,7 @@ function handler(metadata, response) {
   response.setHeader("Content-Type", "", false);
   var body = getFileContents(do_get_file(tests[testRan].path));
   var bos = new BinaryOutputStream(response.bodyOutputStream);
-  bos.writeByteArray(body);
+  bos.writeByteArray(body, body.length);
 }
 
 function run_test() {
diff --git a/toolkit/components/places/PageIconProtocolHandler.jsm b/toolkit/components/places/PageIconProtocolHandler.jsm
@@ -49,13 +49,13 @@ function streamDefaultFavicon(uri, loadInfo, outputStream, originalChannel) {
   }
 }
 
-function serveIcon(pipe, data) {
+function serveIcon(pipe, data, len) {
   // Pass the icon data to the output stream.
   let stream = Cc["@mozilla.org/binaryoutputstream;1"].createInstance(
     Ci.nsIBinaryOutputStream
   );
   stream.setOutputStream(pipe.outputStream);
-  stream.writeByteArray(data);
+  stream.writeByteArray(data, len);
   stream.close();
   pipe.outputStream.close();
 }
@@ -109,10 +109,7 @@ PageIconProtocolHandler.prototype = {
             try {
               channel.contentType = mimeType;
               channel.contentLength = len;
-              if (len != data.length) {
-                throw new Error("Unexpected data length");
-              }
-              serveIcon(pipe, data);
+              serveIcon(pipe, data, len);
             } catch (ex) {
               streamDefaultFavicon(uri, loadInfo, pipe.outputStream, channel);
             }
diff --git a/toolkit/components/telemetry/tests/unit/test_TelemetryLateWrites.js b/toolkit/components/telemetry/tests/unit/test_TelemetryLateWrites.js
@@ -48,7 +48,7 @@ function write_string_to_file(file, contents) {
   bos.setOutputStream(ostream);
 
   let utf8 = new TextEncoder("utf-8").encode(contents);
-  bos.writeByteArray(utf8);
+  bos.writeByteArray(utf8, utf8.length);
   ostream.QueryInterface(Ci.nsISafeOutputStream).finish();
   ostream.close();
 }
diff --git a/xpcom/io/nsBinaryStream.cpp b/xpcom/io/nsBinaryStream.cpp
diff --git a/xpcom/io/nsIBinaryOutputStream.idl b/xpcom/io/nsIBinaryOutputStream.idl
diff --git a/xpcom/tests/unit/test_storagestream.js b/xpcom/tests/unit/test_storagestream.js
diff --git a/xpcom/tests/unit/test_streams.js b/xpcom/tests/unit/test_streams.js

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@ function handleRequest(request, response)`
`6`	`6`	`.createInstance(Components.interfaces.nsIBinaryOutputStream);`
`7`	`7`	`bos.setOutputStream(response.bodyOutputStream);`
`8`	`8`
`9`		`- bos.writeByteArray(body);`
	`9`	`+ bos.writeByteArray(body, body.length);`
`10`	`10`	`}`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@ function handleRequest(request, response) {`
`15`	`15`	`var bos = new BinaryOutputStream(response.bodyOutputStream);`
`16`	`16`
`17`	`17`	`response.processAsync();`
`18`		`- bos.writeByteArray(bodyBytes);`
	`18`	`+ bos.writeByteArray(bodyBytes, bodyBytes.length);`
`19`	`19`	`response.finish();`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ function handleRequest(request, response) {`
`13`	`13`	`.createInstance(Components.interfaces.nsIBinaryOutputStream);`
`14`	`14`	`bos.setOutputStream(response.bodyOutputStream);`
`15`	`15`
`16`		`- bos.writeByteArray(bytes);`
	`16`	`+ bos.writeByteArray(bytes, bytes.length);`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ function handleRequest(request, response)`
`62`	`62`	`response.setHeader("Content-Type", "image/png", false);`
`63`	`63`
`64`	`64`	`var stream = new BinaryOutputStream(response.bodyOutputStream);`
`65`		`- stream.writeByteArray(IMAGE_DATA);`
	`65`	`+ stream.writeByteArray(IMAGE_DATA, IMAGE_DATA.length);`
`66`	`66`	`}`
`67`	`67`	`else`
`68`	`68`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ function dumpToFile(aData) {`
`25`	`25`	`);`
`26`	`26`	`bos.setOutputStream(outputStream);`
`27`	`27`
`28`		`- bos.writeByteArray(aData);`
	`28`	`+ bos.writeByteArray(aData, aData.length);`
`29`	`29`
`30`	`30`	`outputStream.close();`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ function test_cross_conversion()`
`89`	`89`	`while ((av = fin.available()) > 0)`
`90`	`90`	`{`
`91`	`91`	`var data = fin.readByteArray(av);`
`92`		`- bos.writeByteArray(data);`
	`92`	`+ bos.writeByteArray(data, data.length);`
`93`	`93`	`}`
`94`	`94`	`fin.close();`
`95`	`95`	`bos.close();`
Original file line number	Diff line number	Diff line change
`@@ -973,8 +973,7 @@ static nsresult WriteScriptOrFunction(nsIObjectOutputStream* stream,`
`973`	`973`	`}`
`974`	`974`	`rv = stream->Write32(size);`
`975`	`975`	`if (NS_SUCCEEDED(rv)) {`
`976`		`- // Ideally we could just pass "buffer" here. See bug 1566574.`
`977`		`- rv = stream->WriteBytes(MakeSpan(buffer.begin(), size));`
	`976`	`+ rv = stream->WriteBytes(reinterpret_cast<char*>(buffer.begin()), size);`
`978`	`977`	`}`
`979`	`978`
`980`	`979`	`return rv;`