Bug 1308084 - Silence noisy warning in nsChannelClassifier::ShouldEnableTrackingProtection(). r?gcp draft
authorFrancois Marier <francois@mozilla.com>
Thu, 10 Nov 2016 21:01:00 -0800
changeset 437641 d3f02c6e05e0c94357f37617e27a32e786c75a2e
parent 437246 d38d06f85ef59c5dbb5d4a1a8d895957a78714de
child 536685 09e0211f2fdfbf7f17a95764bbfc640908378463
push id35467
push userfmarier@mozilla.com
push dateFri, 11 Nov 2016 06:01:33 +0000
reviewersgcp
bugs1308084
milestone52.0a1
Bug 1308084 - Silence noisy warning in nsChannelClassifier::ShouldEnableTrackingProtection(). r?gcp MozReview-Commit-ID: 68n7476sVUM
netwerk/base/nsChannelClassifier.cpp
--- a/netwerk/base/nsChannelClassifier.cpp
+++ b/netwerk/base/nsChannelClassifier.cpp
@@ -73,17 +73,20 @@ nsChannelClassifier::ShouldEnableTrackin
     }
 
     nsresult rv;
     nsCOMPtr<mozIThirdPartyUtil> thirdPartyUtil =
         do_GetService(THIRDPARTYUTIL_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsCOMPtr<nsIHttpChannelInternal> chan = do_QueryInterface(aChannel, &rv);
-    NS_ENSURE_SUCCESS(rv, rv);
+    if (NS_FAILED(rv) || !chan) {
+      LOG(("nsChannelClassifier[%p]: Not an HTTP channel", this));
+      return NS_OK;
+    }
 
     nsCOMPtr<nsIURI> topWinURI;
     rv = chan->GetTopWindowURI(getter_AddRefs(topWinURI));
     NS_ENSURE_SUCCESS(rv, rv);
 
     if (!topWinURI) {
       LOG(("nsChannelClassifier[%p]: No window URI\n", this));
     }