Commit 756cf900 authored by Tim Huang's avatar Tim Huang
Browse files

Bug 1336802 - Part 2: Updating the whole code base to make sure nsILoadInfo get null check. r=smaug 

--HG--
extra : rebase_source : 22149fd540fd02119afe9fe5c9a815d01cf959c1
parent c44e5b41

dom/base/nsContentUtils.cpp

+3 −0
Original line number Diff line number Diff line
@@ -9831,6 +9831,9 @@ nsContentUtils::AttemptLargeAllocationLoad(nsIHttpChannel* aChannel) 
  NS_ENSURE_SUCCESS(rv, false);



  nsCOMPtr<nsILoadInfo> loadInfo = aChannel->GetLoadInfo();

  if (!loadInfo) {

    return false;

  }

  nsCOMPtr<nsIPrincipal> triggeringPrincipal = loadInfo->TriggeringPrincipal();



  // Get the channel's load flags, and use them to generate nsIWebNavigation

dom/base/nsObjectLoadingContent.cpp

+1 −0
Original line number Diff line number Diff line
@@ -2595,6 +2595,7 @@ nsObjectLoadingContent::OpenChannel() 
  NS_ENSURE_SUCCESS(rv, rv);

  if (inherit) {

    nsCOMPtr<nsILoadInfo> loadinfo = chan->GetLoadInfo();

    NS_ENSURE_STATE(loadinfo);

    loadinfo->SetPrincipalToInherit(thisContent->NodePrincipal());

  }

dom/base/nsScriptLoader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2524,7 +2524,7 @@ nsScriptLoader::OnStreamComplete(nsIIncrementalStreamLoader* aLoader, 
  } else {

    nsCOMPtr<nsILoadInfo> loadInfo = channel->GetLoadInfo();



    if (loadInfo->GetEnforceSRI()) {

    if (loadInfo && loadInfo->GetEnforceSRI()) {

      MOZ_LOG(SRILogHelper::GetSriLog(), mozilla::LogLevel::Debug,

              ("nsScriptLoader::OnStreamComplete, required SRI not found"));

      nsCOMPtr<nsIContentSecurityPolicy> csp;

dom/fetch/FetchDriver.cpp

+3 −1
Original line number Diff line number Diff line
@@ -349,8 +349,10 @@ FetchDriver::HttpFetch() 
    AutoTArray<nsCString, 5> unsafeHeaders;

    mRequest->Headers()->GetUnsafeHeaders(unsafeHeaders);

    nsCOMPtr<nsILoadInfo> loadInfo = chan->GetLoadInfo();

    if (loadInfo) {

      loadInfo->SetCorsPreflightInfo(unsafeHeaders, false);

    }

  }



  rv = chan->AsyncOpen2(this);

  NS_ENSURE_SUCCESS(rv, rv);

dom/html/nsHTMLDocument.cpp

+2 −0
Original line number Diff line number Diff line
@@ -2318,8 +2318,10 @@ nsHTMLDocument::CreateAndAddWyciwygChannel(void) 
                     nsIContentPolicy::TYPE_OTHER);

  NS_ENSURE_SUCCESS(rv, rv);

  nsCOMPtr<nsILoadInfo> loadInfo = channel->GetLoadInfo();

  NS_ENSURE_STATE(loadInfo);

  loadInfo->SetPrincipalToInherit(NodePrincipal());





  mWyciwygChannel = do_QueryInterface(channel);



  mWyciwygChannel->SetSecurityInfo(mSecurityInfo);