mozilla-central: changeset 413245:f7fb95c9979452fe25e42873f54cf56a80a0a0d8

author	Valentin Gosu <valentin.gosu@gmail.com>
	Tue, 10 Apr 2018 22:07:47 +0200
changeset 413245	f7fb95c9979452fe25e42873f54cf56a80a0a0d8
parent 413244	0d23d74448c8493ac96828ee757f0211c47a7b44
child 413246	6a53c90b362b4eb2243e07592ef4aff23ef6166f
push id	33840
push user	apavel@mozilla.com
push date	Fri, 13 Apr 2018 21:56:54 +0000
treeherder	mozilla-central@6547c27303bc [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	bagder
bugs	1452417
milestone	61.0a1
first release with	nightly linux32 6547c27303bc / 61.0a1 / 20180413220147 / files nightly linux64 6547c27303bc / 61.0a1 / 20180413220147 / files nightly mac 6547c27303bc / 61.0a1 / 20180413220147 / files nightly win32 6547c27303bc / 61.0a1 / 20180413220147 / files nightly win64 6547c27303bc / 61.0a1 / 20180413220147 / files
last release without	nightly linux32 cf543bdd424f / 61.0a1 / 20180413100443 / files nightly linux64 cf543bdd424f / 61.0a1 / 20180413100443 / files nightly mac cf543bdd424f / 61.0a1 / 20180413100443 / files nightly win32 cf543bdd424f / 61.0a1 / 20180413100443 / files nightly win64 cf543bdd424f / 61.0a1 / 20180413100443 / files

--- a/netwerk/base/ProxyAutoConfig.cpp
+++ b/netwerk/base/ProxyAutoConfig.cpp
@@ -302,18 +302,19 @@ public:
     mStatus = status;
     mResponse = record;
     return NS_OK;
   }
 
   // nsITimerCallback
   NS_IMETHOD Notify(nsITimer *timer) override
   {
-    if (mRequest)
-      mRequest->Cancel(NS_ERROR_NET_TIMEOUT);
+    nsCOMPtr<nsICancelable> request(mRequest);
+    if (request)
+      request->Cancel(NS_ERROR_NET_TIMEOUT);
     mTimer = nullptr;
     return NS_OK;
   }
 
   // nsINamed
   NS_IMETHOD GetName(nsACString& aName) override
   {
     aName.AssignLiteral("PACResolver");