Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Unified Diff: mozilla/security/nss/lib/pk11wrap/pk11util.c

Issue 11359091: Update NSS to NSS 3.14 pre-release snapshot 2012-06-26 01:00:00 PDT. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Remove the RCS Id from nss-shvfy-const.patch Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mozilla/security/nss/lib/pk11wrap/pk11util.c
===================================================================
--- mozilla/security/nss/lib/pk11wrap/pk11util.c (revision 164196)
+++ mozilla/security/nss/lib/pk11wrap/pk11util.c (working copy)
@@ -1082,7 +1082,7 @@
}
SECMOD_ReleaseReadLock(moduleLock);
/* if everything was perm modules, don't lock up forever */
- if (!removableSlotsFound) {
+ if ((mod->slotCount !=0) && !removableSlotsFound) {
error =SEC_ERROR_NO_SLOT_SELECTED;
PZ_Lock(mod->refLock);
break;
@@ -1251,6 +1251,9 @@
ret = PR_TRUE;
break;
}
+ if (mod->slotCount == 0 ) {
+ ret = PR_TRUE;
+ }
SECMOD_ReleaseReadLock(moduleLock);
return ret;
}

Powered by Google App Engine
This is Rietveld 408576698