diff options
| author | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2017-02-08 10:41:02 +0100 |
|---|---|---|
| committer | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2017-02-08 10:41:02 +0100 |
| commit | 83d5a0238c71fcbbf2f81f69f589e4e9caaa1f68 (patch) | |
| tree | cff11371f9ebe02efaf84832195eb5c00f1f2eca /lib/pk11wrap/pk11cert.c | |
| parent | 4fcd4b284e329834b7a1615aab70bef05b3376e2 (diff) | |
| download | nss-hg-83d5a0238c71fcbbf2f81f69f589e4e9caaa1f68.tar.gz | |
Bug 1278965 - tsan race in CERTCertificate, r=wtc,ttaubert
Diffstat (limited to 'lib/pk11wrap/pk11cert.c')
| -rw-r--r-- | lib/pk11wrap/pk11cert.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pk11wrap/pk11cert.c b/lib/pk11wrap/pk11cert.c index f95f4c8e9..699609947 100644 --- a/lib/pk11wrap/pk11cert.c +++ b/lib/pk11wrap/pk11cert.c @@ -974,8 +974,10 @@ PK11_ImportCert(PK11SlotInfo *slot, CERTCertificate *cert, nssCertificateStore_RemoveCertLOCKED(cc->certStore, c); nssCertificateStore_Unlock(cc->certStore, &lockTrace, &unlockTrace); c->object.cryptoContext = NULL; + CERT_LockCertTempPerm(cert); cert->istemp = PR_FALSE; cert->isperm = PR_TRUE; + CERT_UnlockCertTempPerm(cert); } /* add the new instance to the cert, force an update of the |