diff options
| author | John M. Schanck <jschanck@mozilla.com> | 2022-09-09 09:24:15 -0700 |
|---|---|---|
| committer | John M. Schanck <jschanck@mozilla.com> | 2022-09-09 09:24:15 -0700 |
| commit | ad861829806a8edcd883870c1488f8bec2de5b87 (patch) | |
| tree | 7714a8b5d8849f905864e4fc7a5e54f28df57059 /lib/softoken | |
| parent | d13cbfa0c40e5512743a4c4c6702bede3f6eb612 (diff) | |
| download | nss-hg-ad861829806a8edcd883870c1488f8bec2de5b87.tar.gz | |
Backed out changeset b225a756abc2
Diffstat (limited to 'lib/softoken')
| -rw-r--r-- | lib/softoken/pkcs11.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/lib/softoken/pkcs11.c b/lib/softoken/pkcs11.c index f9a83be8c..aceeaed48 100644 --- a/lib/softoken/pkcs11.c +++ b/lib/softoken/pkcs11.c @@ -4218,20 +4218,16 @@ NSC_OpenSession(CK_SLOT_ID slotID, CK_FLAGS flags, } while (sessionID == CK_INVALID_HANDLE); lock = SFTK_SESSION_LOCK(slot, sessionID); PZ_Lock(lock); - if (!slot->head) { - sessionID = CK_INVALID_HANDLE; - sftk_DestroySession(session); - PZ_Unlock(lock); - break; - } sameID = NULL; - sftkqueue_find(sameID, sessionID, slot->head, slot->sessHashSize); - if (sameID == NULL) { - session->handle = sessionID; - sftk_update_state(slot, session); - sftkqueue_add(session, sessionID, slot->head, slot->sessHashSize); - } else { - slot->sessionIDConflict++; /* for debugging */ + if (slot->head) { + sftkqueue_find(sameID, sessionID, slot->head, slot->sessHashSize); + if (sameID == NULL) { + session->handle = sessionID; + sftk_update_state(slot, session); + sftkqueue_add(session, sessionID, slot->head, slot->sessHashSize); + } else { + slot->sessionIDConflict++; /* for debugging */ + } } PZ_Unlock(lock); } while (sameID != NULL); |