diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-20 22:37:07 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-20 22:37:07 +0000 |
| commit | fc68bc1afaa6ae5717df65d43de0f636b447f6d3 (patch) | |
| tree | 5d398e1d8dcce6f121e332492852ba5c5e489b7e /net/cert | |
| parent | b2b1d913a72eade6643e32256098a68f5f70a700 (diff) | |
| download | chromium_src-fc68bc1afaa6ae5717df65d43de0f636b447f6d3.zip chromium_src-fc68bc1afaa6ae5717df65d43de0f636b447f6d3.tar.gz chromium_src-fc68bc1afaa6ae5717df65d43de0f636b447f6d3.tar.bz2 | |
Fix NSSCertDatabase Singleton access DCHECK
NSSCertDatabase::ListCerts is being called from a worker thread
in CertLoader. Since NSSCertDatabase is a Singleton, this triggers a
DCHECK when a Debug build is run on a device (see issue).
Simple fix (without re-factoring) is to make NSSCertDatabase a LeakySingleton to avoid the DCHECK.
BUG=241292
Review URL: https://chromiumcodereview.appspot.com/15134007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201152 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/cert')
| -rw-r--r-- | net/cert/nss_cert_database.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/cert/nss_cert_database.cc b/net/cert/nss_cert_database.cc index 651b521..df3ddc0 100644 --- a/net/cert/nss_cert_database.cc +++ b/net/cert/nss_cert_database.cc @@ -43,7 +43,8 @@ NSSCertDatabase::ImportCertFailure::~ImportCertFailure() {} // static NSSCertDatabase* NSSCertDatabase::GetInstance() { - return Singleton<NSSCertDatabase>::get(); + return Singleton<NSSCertDatabase, + LeakySingletonTraits<NSSCertDatabase> >::get(); } NSSCertDatabase::NSSCertDatabase() |