corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out 3 changesets (bug 1668248) for Devtools failures in devtools/shared/resources/tests/browser_resources_websocket.js. CLOSED TREE

Browse Source 
Backed out changeset 3097e934187b (bug 1668248)
Backed out changeset 9f6b8aa11110 (bug 1668248)
Backed out changeset eaa857f4564d (bug 1668248)
This commit is contained in:
Dorel Luca
2020-10-01 21:24:48 +03:00
parent 547dfd77ca
commit a1946dd01c
3 changed files with 6 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dom/base/nsDOMDataChannel.cpp
View File

@@ -170,11 +170,7 @@ void nsDOMDataChannel::Close() {
// All of the following is copy/pasted from WebSocket.cpp.
void nsDOMDataChannel::Send(const nsAString& aData, ErrorResult& aRv) {
nsAutoCString msgString;
if (AppendUTF16toUTF8(aData, msgString, mozilla::fallible_t())) {
aRv.Throw(NS_ERROR_FILE_TOO_BIG);
return;
}
NS_ConvertUTF16toUTF8 msgString(aData);
Send(nullptr, &msgString, false, aRv);
}
@@ -210,12 +206,7 @@ void nsDOMDataChannel::Send(const ArrayBuffer& aData, ErrorResult& aRv) {
uint32_t len = aData.Length();
char* data = reinterpret_cast<char*>(aData.Data());
nsDependentCSubstring msgString;
if (!msgString.Assign(data, len, mozilla::fallible_t())) {
aRv.Throw(NS_ERROR_FILE_TOO_BIG);
return;
}
nsDependentCSubstring msgString(data, len);
Send(nullptr, &msgString, true, aRv);
}
@@ -229,12 +220,7 @@ void nsDOMDataChannel::Send(const ArrayBufferView& aData, ErrorResult& aRv) {
uint32_t len = aData.Length();
char* data = reinterpret_cast<char*>(aData.Data());
nsDependentCSubstring msgString;
if (!msgString.Assign(data, len, mozilla::fallible_t())) {
aRv.Throw(NS_ERROR_FILE_TOO_BIG);
return;
}
nsDependentCSubstring msgString(data, len);
Send(nullptr, &msgString, true, aRv);
}

22
dom/media/tests/crashtests/datachannel-oom.html
View File

@@ -1,22 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title></title>
<script type="application/javascript">
function start() {
var size = 2147483638;
new RTCPeerConnection().createDataChannel('a').send(new Uint8Array(size));
var a = "a";
var count = Math.floor(Math.log2(size)) - 1;
for (var i = 0; i < count; i++) {
a += a;
}
new RTCPeerConnection().createDataChannel('a').send(a)
}
</script>
</head>
<body onload="start()">
</body>
</html>

18
dom/websocket/WebSocket.cpp
View File

@@ -2216,11 +2216,7 @@ void WebSocket::GetProtocol(nsAString& aProtocol) {
void WebSocket::Send(const nsAString& aData, ErrorResult& aRv) {
AssertIsOnTargetThread();
nsAutoCString msgString;
if (AppendUTF16toUTF8(aData, msgString, mozilla::fallible_t())) {
aRv.Throw(NS_ERROR_FILE_TOO_BIG);
return;
}
NS_ConvertUTF16toUTF8 msgString(aData);
Send(nullptr, msgString, msgString.Length(), false, aRv);
}
@@ -2256,11 +2252,7 @@ void WebSocket::Send(const ArrayBuffer& aData, ErrorResult& aRv) {
uint32_t len = aData.Length();
char* data = reinterpret_cast<char*>(aData.Data());
nsDependentCSubstring msgString;
if (!msgString.Assign(data, len, mozilla::fallible_t())) {
aRv.Throw(NS_ERROR_FILE_TOO_BIG);
return;
}
nsDependentCSubstring msgString(data, len);
Send(nullptr, msgString, len, true, aRv);
}
@@ -2274,11 +2266,7 @@ void WebSocket::Send(const ArrayBufferView& aData, ErrorResult& aRv) {
uint32_t len = aData.Length();
char* data = reinterpret_cast<char*>(aData.Data());
nsDependentCSubstring msgString;
if (!msgString.Assign(data, len, mozilla::fallible_t())) {
aRv.Throw(NS_ERROR_FILE_TOO_BIG);
return;
}
nsDependentCSubstring msgString(data, len);
Send(nullptr, msgString, len, true, aRv);
}