From e020eaf4ef060b230a719a9fb7cfdc757f4bf248 Mon Sep 17 00:00:00 2001 From: "rpotts%netscape.com" Date: Sun, 22 Nov 1998 09:28:44 +0000 Subject: [PATCH] Return NS_BINDING_FAILED if nw stream was created... git-svn-id: svn://10.0.0.236/trunk@15128 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/uriloader/base/nsDocLoader.cpp | 5 ++--- mozilla/webshell/src/nsDocLoader.cpp | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mozilla/uriloader/base/nsDocLoader.cpp b/mozilla/uriloader/base/nsDocLoader.cpp index 015da9cb5e5..a4f895ecb9e 100644 --- a/mozilla/uriloader/base/nsDocLoader.cpp +++ b/mozilla/uriloader/base/nsDocLoader.cpp @@ -1413,8 +1413,6 @@ NS_METHOD nsDocumentBindInfo::OnStartBinding(nsIURL* aURL, const char *aContentT * Pass the OnStartBinding(...) notification out to the document * IStreamListener. */ - NS_ASSERTION((nsnull != m_NextStream), "No stream was created!"); - if (nsnull != m_NextStream) { rv = m_NextStream->OnStartBinding(aURL, aContentType); } @@ -1447,7 +1445,6 @@ NS_METHOD nsDocumentBindInfo::OnDataAvailable(nsIURL* aURL, goto done; } - NS_PRECONDITION(nsnull !=m_NextStream, "DocLoader: No stream for document"); if (nsnull != m_NextStream) { /* * Bump the refcount in case the stream gets destroyed while the data @@ -1462,6 +1459,8 @@ NS_METHOD nsDocumentBindInfo::OnDataAvailable(nsIURL* aURL, NS_ADDREF(listener); rv = listener->OnDataAvailable(aURL, aStream, aLength); NS_RELEASE(listener); + } else { + rv = NS_BINDING_FAILED; } done: diff --git a/mozilla/webshell/src/nsDocLoader.cpp b/mozilla/webshell/src/nsDocLoader.cpp index 015da9cb5e5..a4f895ecb9e 100644 --- a/mozilla/webshell/src/nsDocLoader.cpp +++ b/mozilla/webshell/src/nsDocLoader.cpp @@ -1413,8 +1413,6 @@ NS_METHOD nsDocumentBindInfo::OnStartBinding(nsIURL* aURL, const char *aContentT * Pass the OnStartBinding(...) notification out to the document * IStreamListener. */ - NS_ASSERTION((nsnull != m_NextStream), "No stream was created!"); - if (nsnull != m_NextStream) { rv = m_NextStream->OnStartBinding(aURL, aContentType); } @@ -1447,7 +1445,6 @@ NS_METHOD nsDocumentBindInfo::OnDataAvailable(nsIURL* aURL, goto done; } - NS_PRECONDITION(nsnull !=m_NextStream, "DocLoader: No stream for document"); if (nsnull != m_NextStream) { /* * Bump the refcount in case the stream gets destroyed while the data @@ -1462,6 +1459,8 @@ NS_METHOD nsDocumentBindInfo::OnDataAvailable(nsIURL* aURL, NS_ADDREF(listener); rv = listener->OnDataAvailable(aURL, aStream, aLength); NS_RELEASE(listener); + } else { + rv = NS_BINDING_FAILED; } done: