Bug 2023302 - null check mResponseHead when calling ClearHeaders r=necko-reviewers,jesup (38093bbe) · Commits · The Tor Project / Applications / Tor Browser

netwerk/protocol/http/nsHttpChannel.cpp

+11 −3

Original line number	Diff line number	Diff line
		@@ -5312,7 +5312,7 @@ void nsHttpChannel::CloseCacheEntry(bool doomOnFailure) {
		if (LoadInitedCacheEntry()) {
		MOZ_ASSERT(mResponseHead, "oops");
		if (NS_FAILED(mStatus) && doomOnFailure && LoadCacheEntryIsWriteOnly() &&
		!mResponseHead->IsResumable()) {
		(!mResponseHead \|\| !mResponseHead->IsResumable())) {
		doom = true;
		}
		} else if (LoadCacheEntryIsWriteOnly()) {
		@@ -6417,7 +6417,8 @@ nsresult nsHttpChannel::CancelInternal(nsresult status) {

		// We don't want the content process to see any header values
		// when the request is blocked by ORB
		if (mChannelBlockedByOpaqueResponse && mCachedOpaqueResponseBlockingPref) {
		if (mChannelBlockedByOpaqueResponse && mCachedOpaqueResponseBlockingPref &&
		mResponseHead) {
		mResponseHead->ClearHeaders();
		}

		@@ -9096,7 +9097,13 @@ nsresult nsHttpChannel::ContinueOnStopRequest(nsresult aStatus, bool aIsFromNet,
		LOG((" but range request setup failed rv=0x%08" PRIx32
		", failing load",
		static_cast<uint32_t>(rv)));
		aStatus = NS_ERROR_NET_INTERRUPT;
		}

		// Range-request recovery failed. Restore mResponseHead so that
		// it's available to late callers of Cancel (such as the ORB
		// async JS-validation callback)
		mResponseHead = std::move(mCachedResponseHead);
		}
		}
		}
		@@ -9213,7 +9220,8 @@ nsresult nsHttpChannel::ContinueOnStopRequest(nsresult aStatus, bool aIsFromNet,

		RemoveAsNonTailRequest();

		if (mChannelBlockedByOpaqueResponse && mCachedOpaqueResponseBlockingPref) {
		if (mChannelBlockedByOpaqueResponse && mCachedOpaqueResponseBlockingPref &&
		mResponseHead) {
		mResponseHead->ClearHeaders();
		}
		// If a preferred alt-data type was set, this signals the consumer is