Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes 84444 & 84441. r=gagan@netscape.com, sr=darin@netscape.com, a=chofmann

Browse Source
This commit is contained in:
dougt%netscape.com 2001-06-21 22:06:19 +00:00
parent da97a3ccff
commit 32793f6a0c
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
netwerk/streamconv/converters/nsMultiMixedConv.cpp
View File

@ -370,6 +370,10 @@ nsMultiMixedConv::AsyncConvertData(const PRUnichar *aFromType, const PRUnichar *
NS_IMETHODIMP NS_IMETHODIMP
nsMultiMixedConv::OnDataAvailable(nsIRequest *request, nsISupports *context, nsMultiMixedConv::OnDataAvailable(nsIRequest *request, nsISupports *context,
nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count) { nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count) {
if (!mToken.get()) // no token, no love.
return NS_ERROR_FAILURE;
nsresult rv = NS_OK; nsresult rv = NS_OK;
char *buffer = nsnull; char *buffer = nsnull;
PRUint32 bufLen = count, read; PRUint32 bufLen = count, read;
@ -589,12 +593,19 @@ nsMultiMixedConv::OnStartRequest(nsIRequest *request, nsISupports *ctxt) {
mToken.Adopt(nsCRT::strdup(boundaryString.get())); mToken.Adopt(nsCRT::strdup(boundaryString.get()));
mTokenLen = boundaryString.Length(); mTokenLen = boundaryString.Length();
if (mTokenLen == 0 || !boundaryString.get())
return NS_ERROR_FAILURE;
return NS_OK; return NS_OK;
} }
NS_IMETHODIMP NS_IMETHODIMP
nsMultiMixedConv::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsMultiMixedConv::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
nsresult aStatus) { nsresult aStatus) {
if (!mToken.get()) // no token, no love.
return NS_ERROR_FAILURE;
if (mPartChannel) { if (mPartChannel) {
// we've already called SendStart() (which sets up the mPartChannel, // we've already called SendStart() (which sets up the mPartChannel,
// and fires an OnStart()) send any data left over, and then fire the stop. // and fires an OnStart()) send any data left over, and then fire the stop.
@ -611,7 +622,12 @@ nsMultiMixedConv::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
// underlying data production problem. we should not be in // underlying data production problem. we should not be in
// the middle of sending data. if we were, mPartChannel, // the middle of sending data. if we were, mPartChannel,
// above, would have been true. // above, would have been true.
(void) mFinalListener->OnStartRequest(request, ctxt);
// if we send the start, the URI Loader's m_targetStreamListener, may
// be pointing at us causing a nice stack overflow. So, don't call
// OnStartRequest! - This breaks necko's semantecs.
//(void) mFinalListener->OnStartRequest(request, ctxt);
(void) mFinalListener->OnStopRequest(request, ctxt, aStatus); (void) mFinalListener->OnStopRequest(request, ctxt, aStatus);
} }