Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(71)

Unified Diff: net/base/cert_verifier.cc

Issue 5973004: The CertVerifierJob destructor should delete canceled requests.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Sync with ToT Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | net/base/cert_verifier_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/cert_verifier.cc
===================================================================
--- net/base/cert_verifier.cc (revision 72195)
+++ net/base/cert_verifier.cc (working copy)
@@ -109,6 +109,8 @@
delete this;
}
+ bool canceled() const { return !callback_; }
+
private:
CompletionCallback* callback_;
CertVerifyResult* verify_result_;
@@ -236,8 +238,10 @@
}
~CertVerifierJob() {
- if (worker_)
+ if (worker_) {
worker_->Cancel();
+ DeleteAllCanceled();
+ }
}
void AddRequest(CertVerifierRequest* request) {
@@ -261,6 +265,17 @@
}
}
+ void DeleteAllCanceled() {
+ for (std::vector<CertVerifierRequest*>::iterator
+ i = requests_.begin(); i != requests_.end(); i++) {
+ if ((*i)->canceled()) {
+ delete *i;
+ } else {
+ LOG(DFATAL) << "CertVerifierRequest leaked!";
+ }
+ }
+ }
+
std::vector<CertVerifierRequest*> requests_;
CertVerifierWorker* worker_;
};
@@ -328,14 +343,15 @@
CertVerifierWorker* worker = new CertVerifierWorker(cert, hostname, flags,
this);
job = new CertVerifierJob(worker);
- inflight_.insert(std::make_pair(key, job));
if (!worker->Start()) {
- inflight_.erase(key);
delete job;
delete worker;
*out_req = NULL;
- return ERR_FAILED; // TODO(wtc): Log an error message.
+ // TODO(wtc): log to the NetLog.
+ LOG(ERROR) << "CertVerifierWorker couldn't be started.";
+ return ERR_INSUFFICIENT_RESOURCES; // Just a guess.
}
+ inflight_.insert(std::make_pair(key, job));
}
CertVerifierRequest* request =
« no previous file with comments | « no previous file | net/base/cert_verifier_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698