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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: nss/lib/pk11wrap/pk11load.c

Issue 1504923011: Update NSS to 3.21 RTM and NSPR to 4.11 RTM (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/nss
Patch Set: Created 5 years 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
« nss/lib/freebl/ecl/ecp_jac.c ('K') | « nss/lib/pk11wrap/pk11cert.c ('k') | nss/lib/pk11wrap/pk11mech.c » ('j') | nss/lib/util/pkcs11n.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: nss/lib/pk11wrap/pk11load.c
diff --git a/nss/lib/pk11wrap/pk11load.c b/nss/lib/pk11wrap/pk11load.c
index 1811a1aed3377d210b26677bff9ebd230cdb45ed..bf7cc68dae2b9c23e24ac973114ba086037887d5 100644
--- a/nss/lib/pk11wrap/pk11load.c
+++ b/nss/lib/pk11wrap/pk11load.c
@@ -622,8 +622,12 @@ SECMOD_UnloadModule(SECMODModule *mod) {
if (softokenLib) {
disableUnload = PR_GetEnv("NSS_DISABLE_UNLOAD");
if (!disableUnload) {
+#ifdef DEBUG
PRStatus status = PR_UnloadLibrary(softokenLib);
PORT_Assert(PR_SUCCESS == status);
+#else
+ PR_UnloadLibrary(softokenLib);
+#endif
}
softokenLib = NULL;
}
« nss/lib/freebl/ecl/ecp_jac.c ('K') | « nss/lib/pk11wrap/pk11cert.c ('k') | nss/lib/pk11wrap/pk11mech.c » ('j') | nss/lib/util/pkcs11n.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698