Commit 57f7cbb5 authored by mscott%netscape.com's avatar mscott%netscape.com
Browse files

Bug #40160 --> fix annoying assertion in on end document load for cases where... 

Bug #40160 --> fix annoying assertion in on end document load for cases where the url doesn't have a host
r=rpotts
parent 48511a34

docshell/base/nsWebShell.cpp

+49 −48
Original line number Diff line number Diff line
@@ -1117,7 +1117,7 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader, 
   if(loader != mDocLoader)

      return NS_OK;



   nsresult rv = NS_ERROR_FAILURE;

   nsresult rv = NS_OK;

   if(!channel)

      return NS_ERROR_NULL_POINTER;
@@ -1153,7 +1153,6 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader, 
      }



   mEODForCurrentDocument = PR_TRUE;



   nsCOMPtr<nsIDocumentLoaderObserver> dlObserver;



   if(!mDocLoaderObserver && mParent)
@@ -1180,8 +1179,9 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader, 
   if(mDocLoader == loader && NS_FAILED(aStatus))

      {

      nsXPIDLCString host;

      NS_ENSURE_SUCCESS(aURL->GetHost(getter_Copies(host)), NS_ERROR_FAILURE);



      nsresult hostResult = aURL->GetHost(getter_Copies(host));

      if (NS_SUCCEEDED(hostResult) && host)

      {      

      CBufDescriptor buf((const char *)host, PR_TRUE, PL_strlen(host) + 1);

      nsCAutoString hostStr(buf);

      PRInt32 dotLoc = hostStr.FindChar('.');
@@ -1317,6 +1317,7 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader, 
           prompter->Alert(nsnull, msg);            

           nsTextFormatter::smprintf_free(msg);

           } // end NS_ERROR_NET_TIMEOUT

        } // if we have a host

      } // end mDocLoader == loader



      return rv;

webshell/src/nsWebShell.cpp

+49 −48
Original line number Diff line number Diff line
@@ -1117,7 +1117,7 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader, 
   if(loader != mDocLoader)

      return NS_OK;



   nsresult rv = NS_ERROR_FAILURE;

   nsresult rv = NS_OK;

   if(!channel)

      return NS_ERROR_NULL_POINTER;
@@ -1153,7 +1153,6 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader, 
      }



   mEODForCurrentDocument = PR_TRUE;



   nsCOMPtr<nsIDocumentLoaderObserver> dlObserver;



   if(!mDocLoaderObserver && mParent)
@@ -1180,8 +1179,9 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader, 
   if(mDocLoader == loader && NS_FAILED(aStatus))

      {

      nsXPIDLCString host;

      NS_ENSURE_SUCCESS(aURL->GetHost(getter_Copies(host)), NS_ERROR_FAILURE);



      nsresult hostResult = aURL->GetHost(getter_Copies(host));

      if (NS_SUCCEEDED(hostResult) && host)

      {      

      CBufDescriptor buf((const char *)host, PR_TRUE, PL_strlen(host) + 1);

      nsCAutoString hostStr(buf);

      PRInt32 dotLoc = hostStr.FindChar('.');
@@ -1317,6 +1317,7 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader, 
           prompter->Alert(nsnull, msg);            

           nsTextFormatter::smprintf_free(msg);

           } // end NS_ERROR_NET_TIMEOUT

        } // if we have a host

      } // end mDocLoader == loader



      return rv;