Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't crash if AsyncOpen fails and the OnReadyStateChange handler restarts us.

Browse Source 
Bug 366467, r+sr=sicking


git-svn-id: svn://10.0.0.236/trunk@218958 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu 2007-01-26 04:48:14 +00:00
parent 52ceba246f
commit 5848c6cf3c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/content/base/src/nsXMLHttpRequest.cpp
View File

@ -1686,7 +1686,6 @@ nsXMLHttpRequest::Send(nsIVariant *aBody)
mChannel->SetContentType(NS_LITERAL_CSTRING("application/xml"));
// Start reading from the channel
ChangeState(XML_HTTP_REQUEST_SENT);
rv = mChannel->AsyncOpen(listener, nsnull);
if (NS_FAILED(rv)) {
@ -1695,6 +1694,12 @@ nsXMLHttpRequest::Send(nsIVariant *aBody)
return rv;
}
// Now that we've successfully opened the channel, we can change state. Note
// that this needs to come after the AsyncOpen() and rv check, because this
// can run script that would try to restart this request, and that could end
// up doing our AsyncOpen on a null channel if the reentered AsyncOpen fails.
ChangeState(XML_HTTP_REQUEST_SENT);
// If we're synchronous, spin an event loop here and wait
if (!(mState & XML_HTTP_REQUEST_ASYNC)) {
nsIThread *thread = NS_GetCurrentThread();