diff options
| author | wchang0222%aol.com <devnull@localhost> | 2004-11-02 18:37:59 +0000 |
|---|---|---|
| committer | wchang0222%aol.com <devnull@localhost> | 2004-11-02 18:37:59 +0000 |
| commit | fd19b8ad3106a71515d659fcfeef58fcc0f3f49a (patch) | |
| tree | 5d0913a2019ef758538394ab596ff46e71d1dbe6 | |
| parent | 463ec8dc2fb1418170f4a394d4dc65813d1f79e3 (diff) | |
| download | nss-hg-fd19b8ad3106a71515d659fcfeef58fcc0f3f49a.tar.gz | |
Fix for 265707 . SECMOD_FindSlot always returns NULL (regression). r=wtcMOZILLA_1_7_5_RELEASE
a=mkaply.
Fix for 265708. - count should be CK_ULONG
Tag: MOZILLA_1_7_BRANCH
| -rw-r--r-- | security/nss/lib/pk11wrap/pk11util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/nss/lib/pk11wrap/pk11util.c b/security/nss/lib/pk11wrap/pk11util.c index b54e8792e..322b212f0 100644 --- a/security/nss/lib/pk11wrap/pk11util.c +++ b/security/nss/lib/pk11wrap/pk11util.c @@ -521,7 +521,6 @@ SECMOD_FindSlot(SECMODModule *module,const char *name) if (retSlot == NULL) { PORT_SetError(SEC_ERROR_NO_SLOT_SELECTED); } - return NULL; return retSlot; } @@ -854,7 +853,8 @@ SECStatus SECMOD_UpdateSlotList(SECMODModule *mod) { CK_RV crv; - int count,i, oldCount; + CK_ULONG count; + int i, oldCount; PRBool freeRef = PR_FALSE; void *mark; CK_ULONG *slotIDs = NULL; |