Bug 940724 - Move XMLHttpRequest off of the stack to silence analysis, r=bent

--HG--
extra : rebase_source : 591b96238eddbeb88ef3f1df3728fc5d02b9229a
This commit is contained in:
Steve Fink 2013-11-19 15:27:00 -08:00
parent 11bf40995e
commit de08ef2d47

View File

@ -682,19 +682,19 @@ public:
}
}
XMLHttpRequest::StateData state;
StateDataAutoRooter rooter(aCx, &state);
nsAutoPtr<XMLHttpRequest::StateData> state(new XMLHttpRequest::StateData());
StateDataAutoRooter rooter(aCx, state);
state.mResponseTextResult = mResponseTextResult;
state.mResponseText = mResponseText;
state->mResponseTextResult = mResponseTextResult;
state->mResponseText = mResponseText;
if (NS_SUCCEEDED(mResponseTextResult)) {
MOZ_ASSERT(JSVAL_IS_VOID(mResponse) || JSVAL_IS_NULL(mResponse));
state.mResponseResult = mResponseTextResult;
state.mResponse = mResponse;
state->mResponseResult = mResponseTextResult;
state->mResponse = mResponse;
}
else {
state.mResponseResult = mResponseResult;
state->mResponseResult = mResponseResult;
if (NS_SUCCEEDED(mResponseResult)) {
if (mResponseBuffer.data()) {
@ -716,23 +716,23 @@ public:
return false;
}
state.mResponse = response;
state->mResponse = response;
}
else {
state.mResponse = mResponse;
state->mResponse = mResponse;
}
}
}
state.mStatusResult = mStatusResult;
state.mStatus = mStatus;
state->mStatusResult = mStatusResult;
state->mStatus = mStatus;
state.mStatusText = mStatusText;
state->mStatusText = mStatusText;
state.mReadyState = mReadyState;
state->mReadyState = mReadyState;
XMLHttpRequest* xhr = mProxy->mXMLHttpRequestPrivate;
xhr->UpdateState(state);
xhr->UpdateState(*state);
if (mUploadEvent && !xhr->GetUploadObjectNoCreate()) {
return true;