autoland: changeset 379641:f41d54eddd16afdd6e6c9034e21ede3d4e3a398f

author	Thomas Nguyen <tnguyen@mozilla.com>
	Thu, 07 Sep 2017 16:16:43 +0800
changeset 379641	f41d54eddd16afdd6e6c9034e21ede3d4e3a398f
parent 379640	30832c0f384d92e37d576b400c78d7093369a72c
child 379642	5baccd396fc4eaf20827f40355772d004faddcfb
push id	50733
push user	tnguyen@mozilla.com
push date	Fri, 08 Sep 2017 06:02:38 +0000
treeherder	autoland@f41d54eddd16 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	Ehsan
bugs	1397231
milestone	57.0a1
first release with	nightly linux32 ea7b55d65d76 / 57.0a1 / 20170908220146 / files nightly linux64 ea7b55d65d76 / 57.0a1 / 20170908220146 / files nightly mac ea7b55d65d76 / 57.0a1 / 20170908220146 / files nightly win32 ea7b55d65d76 / 57.0a1 / 20170908220146 / files nightly win64 ea7b55d65d76 / 57.0a1 / 20170908220146 / files
last release without	nightly linux32 b4c1ad9565ee / 57.0a1 / 20170907220212 / files nightly linux64 b4c1ad9565ee / 57.0a1 / 20170907220212 / files nightly mac b4c1ad9565ee / 57.0a1 / 20170907220212 / files nightly win32 b4c1ad9565ee / 57.0a1 / 20170907220212 / files nightly win64 b4c1ad9565ee / 57.0a1 / 20170907220212 / files

--- a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
+++ b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
@@ -1795,17 +1795,19 @@ nsUrlClassifierDBService::AsyncClassifyL
   nsresult rv = utilsService->GetKeyForURI(uri, key);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (XRE_IsContentProcess()) {
     using namespace mozilla::dom;
     using namespace mozilla::ipc;
 
     ContentChild* content = ContentChild::GetSingleton();
-    MOZ_ASSERT(content);
+    if (NS_WARN_IF(!content || content->IsShuttingDown())) {
+      return NS_ERROR_FAILURE;
+    }
 
     auto actor = new URLClassifierLocalChild();
 
     // TODO: Bug 1353701 - Supports custom event target for labelling.
     nsCOMPtr<nsIEventTarget> systemGroupEventTarget
       = mozilla::SystemGroup::EventTargetFor(mozilla::TaskCategory::Other);
     content->SetEventTargetForActor(actor, systemGroupEventTarget);