From 130fb5d93cffa855a74006441a7710fd8f0f7a73 Mon Sep 17 00:00:00 2001
From: "waterson%netscape.com" <waterson%netscape.com>
Date: Thu, 19 Apr 2001 19:51:29 +0000
Subject: [PATCH] Bug 76286. Bullet-proof code that uses mDocumentRequest; add
 assert-botch to catch cases where first request is not LOAD_DOCUMENT_URI.
 r=darin, sr=mscott, a=chofmann.

---
 uriloader/base/nsDocLoader.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/uriloader/base/nsDocLoader.cpp b/uriloader/base/nsDocLoader.cpp
index eaf1bf78445..1a7d7b8312c 100644
--- a/uriloader/base/nsDocLoader.cpp
+++ b/uriloader/base/nsDocLoader.cpp
@@ -66,13 +66,15 @@ PRLogModuleInfo* gDocLoaderLog = nsnull;
 #if defined(DEBUG)
 void GetURIStringFromRequest(nsIRequest* request, nsXPIDLCString &aStr)
 {
-    nsXPIDLString name;
-    request->GetName(getter_Copies(name));
+    *getter_Shares(aStr) = "???";
 
-    if (name)
-        *getter_Copies(aStr) = ToNewUTF8String(nsLocalString(name));
-    else
-        *getter_Shares(aStr) = "???";
+    if (request) {
+        nsXPIDLString name;
+        request->GetName(getter_Copies(name));
+
+        if (name)
+            *getter_Copies(aStr) = ToNewUTF8String(nsLocalString(name));
+    }
 }
 #endif /* DEBUG */
 
@@ -501,6 +503,9 @@ nsDocLoaderImpl::OnStartRequest(nsIRequest *request, nsISupports *aCtxt)
           doStartURLLoad(request);
           FireOnStartURLLoad(this, request);
         }
+
+        NS_POSTCONDITION((1 != count) || mDocumentRequest,
+                         "first request does not have nsIChannel::LOAD_DOCUMENT_URI set");
     }
     else {
       ClearRequestInfoList();