diff options
| author | Daiki Ueno <dueno@redhat.com> | 2018-03-22 16:08:16 +0100 |
|---|---|---|
| committer | Daiki Ueno <dueno@redhat.com> | 2018-03-22 16:08:16 +0100 |
| commit | 52eb56eb27de1abf8e871ea5e35bd97fefbed1a3 (patch) | |
| tree | 4eeeeba4cf2982971d04ce28932d107073bc3be5 /lib/pk11wrap | |
| parent | 9eb3bed595dbd8e39f8dd3c88a2136cea29b01ce (diff) | |
| download | nss-hg-52eb56eb27de1abf8e871ea5e35bd97fefbed1a3.tar.gz | |
Bug 1447628, devslot: avoid deadlock when re-inserting a token, r=rrelyea
Diffstat (limited to 'lib/pk11wrap')
| -rw-r--r-- | lib/pk11wrap/dev3hack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pk11wrap/dev3hack.c b/lib/pk11wrap/dev3hack.c index b272e4564..3fb0cb0aa 100644 --- a/lib/pk11wrap/dev3hack.c +++ b/lib/pk11wrap/dev3hack.c @@ -122,7 +122,7 @@ nssSlot_CreateFromPK11SlotInfo(NSSTrustDomain *td, PK11SlotInfo *nss3slot) rvSlot->lock = (nss3slot->isThreadSafe) ? NULL : nss3slot->sessionLock; rvSlot->isPresentLock = PZ_NewLock(nssiLockOther); rvSlot->isPresentCondition = PR_NewCondVar(rvSlot->isPresentLock); - rvSlot->inIsPresent = PR_FALSE; + rvSlot->isPresentThread = NULL; rvSlot->lastTokenPingState = nssSlotLastPingState_Reset; return rvSlot; } |