Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 01:44:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1905002 - Null-check mProxy in the XHR worker code a bit more intensely; r=kershaw

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D217050
This commit is contained in:
Thomas Wisniewski 2024-07-19 12:33:44 +00:00
parent 521cebe3bf
commit 61306b9ac5
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dom/xhr/XMLHttpRequestWorker.cpp
View File

@ -1522,12 +1522,14 @@ void XMLHttpRequestWorker::SetResponseToNetworkError() {
MOZ_LOG(gXMLHttpRequestLog, LogLevel::Debug, ("SetResponseToNetworkError"));
mStateData->mStatus = 0;
mStateData->mStatusText.Truncate();
mProxy->mLastLengthComputable = false;
mProxy->mLastLoaded = 0;
mProxy->mLastTotal = 0;
mProxy->mLastUploadLengthComputable = false;
mProxy->mLastUploadLoaded = 0;
mProxy->mLastUploadTotal = 0;
if (mProxy) {
mProxy->mLastLengthComputable = false;
mProxy->mLastLoaded = 0;
mProxy->mLastTotal = 0;
mProxy->mLastUploadLengthComputable = false;
mProxy->mLastUploadLoaded = 0;
mProxy->mLastUploadTotal = 0;
}
}
void XMLHttpRequestWorker::RequestErrorSteps(
@ -1551,7 +1553,7 @@ void XMLHttpRequestWorker::RequestErrorSteps(
SetResponseToNetworkError();
// Step 4: If xhr’s synchronous flag is set, then throw exception.
if (mProxy->mIsSyncXHR) {
if (!mProxy || mProxy->mIsSyncXHR) {
aRv.Throw(aException);
return;
}
@ -1562,7 +1564,8 @@ void XMLHttpRequestWorker::RequestErrorSteps(
}
// Step 6: If xhr’s upload complete flag is unset, then:
if (mUpload && mProxy->mSeenUploadLoadStart && !mProxy->mSeenUploadLoadEnd) {
if (mUpload && mProxy && mProxy->mSeenUploadLoadStart &&
!mProxy->mSeenUploadLoadEnd) {
// Gecko-specific: we can only know whether the proxy XHR's upload
// complete flag is set by waiting for the related upload loadend
// event to happen (at which point upload complete has just been set,