Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 23:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 1460312 - cancel the timeout timer in OCSP request implementation r=jcj

Browse Source 
Bug 1456489 cleaned up our OCSP request implementation a bit. One simplification
it made was to not cancel the timeout timer. It turns out that if we don't, the
OCSPRequest that constitutes the timeout callback's closure might not be valid
if the request has completed (because the timer doesn't own a strong reference
to it). The fix is simple: cancel the timer when the request completes. Note
that we don't have to do the reverse because necko has a strong reference to the
request.

MozReview-Commit-ID: 2WHFLAcGBAw

--HG--
extra : rebase_source : c4216f6792c1d62cbd046b1b3802226c51fbe8af
This commit is contained in:
David Keeler 2018-05-09 10:06:49 -07:00
parent e218ab3e3b
commit 3b971d708e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
security/manager/ssl/nsNSSCallbacks.cpp
View File

@ -96,9 +96,11 @@ private:
// times out, again the response data is filled out, mNotifiedDone is set to
// true, and the monitor is notified. The first of these two events wins. That
// is, if the timeout timer fires but the request completes shortly after, the
// caller will see the request as having timed out, and vice-versa. (Also note
// that no effort is made to cancel either the request or the timeout timer if
// the other event completes first.)
// caller will see the request as having timed out.
// When the request completes (i.e. OnStreamComplete runs), the timer will be
// cancelled. This is how we know the closure in OnTimeout is valid. If the
// timer fires before OnStreamComplete runs, it should be safe to not cancel
// the request because necko has a strong reference to it.
Monitor mMonitor;
bool mNotifiedDone;
nsCOMPtr<nsIStreamLoader> mLoader;
@ -361,6 +363,9 @@ OCSPRequest::NotifyDone(nsresult rv, MonitorAutoLock& lock)
}
mLoader = nullptr;
mResponseResult = rv;
if (mTimeoutTimer) {
Unused << mTimeoutTimer->Cancel();
}
mNotifiedDone = true;
lock.Notify();
return rv;
@ -430,6 +435,9 @@ OCSPRequest::OnTimeout(nsITimer* timer, void* closure)
return;
}
// We know the OCSPRequest is still alive because if the request had completed
// (i.e. OnStreamComplete ran), the timer would have been cancelled in
// NotifyDone.
OCSPRequest* self = static_cast<OCSPRequest*>(closure);
MonitorAutoLock lock(self->mMonitor);
self->mTimeoutTimer = nullptr;