Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 04:38:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1668248 - Use fallible string operations in WebSocket::Send. r=valentin

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D91929
This commit is contained in:
Paul Adenot 2020-10-02 12:42:06 +00:00
parent 0778d12718
commit f18e95d3c1
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dom/websocket/WebSocket.cpp
View File

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