Bug 1208755 HttpBaseChannel::ShouldIntercept() should not assume every channel has a LoadInfo. r=ckerschb

This commit is contained in:
Ben Kelly 2015-09-30 13:48:37 -07:00
parent 3485b8a369
commit ff01387127
2 changed files with 2 additions and 2 deletions

View File

@ -877,7 +877,7 @@ nsJARChannel::ShouldIntercept()
NS_GET_IID(nsINetworkInterceptController),
getter_AddRefs(controller));
bool shouldIntercept = false;
if (controller && !mForceNoIntercept) {
if (controller && !mForceNoIntercept && mLoadInfo) {
bool isNavigation = mLoadFlags & LOAD_DOCUMENT_URI;
nsContentPolicyType type = mLoadInfo->InternalContentPolicyType();
nsresult rv = controller->ShouldPrepareForIntercept(mAppURI,

View File

@ -2272,7 +2272,7 @@ HttpBaseChannel::ShouldIntercept()
nsCOMPtr<nsINetworkInterceptController> controller;
GetCallback(controller);
bool shouldIntercept = false;
if (controller && !mForceNoIntercept) {
if (controller && !mForceNoIntercept && mLoadInfo) {
nsContentPolicyType type = mLoadInfo->InternalContentPolicyType();
nsresult rv = controller->ShouldPrepareForIntercept(mURI,
IsNavigation(),