Attachment 700186 Details for Bug 784676 – Changes since this bug was cloned in patch form

[patch] Changes since this bug was cloned in patch form

nssinit_changes_since_5.8.patch (text/plain), 1.66 KB, created by Elio Maldonado Batiz on 2013-02-20 19:38:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2013-02-20 19:38:11 UTC

Size: 1.66 KB

patch

obsolete

>--- /home/emaldona/work4rhel-all-branches/nss/rhel-5.8/nss-3.13.5/mozilla/security/nss/lib/nss/nssinit.c	2011-10-18 12:03:31.000000000 -0700
>+++ nss-3.13.6/mozilla/security/nss/lib/nss/nssinit.c	2013-02-20 11:23:39.978074365 -0800
>@@ -944,6 +944,12 @@ NSS_RegisterShutdown(NSS_ShutdownFunc sF
> {
>     int i;
> 
>+    /* make sure our lock and condition variable are initialized one and only
>+     * one time */ 
>+    if (PR_CallOnce(&nssInitOnce, nss_doLockInit) != PR_SUCCESS) {
>+	return SECFailure;
>+    }
>+
>     PZ_Lock(nssInitLock);
>     if (!NSS_IsInitialized()) {
> 	PZ_Unlock(nssInitLock);
>@@ -1002,6 +1008,11 @@ NSS_UnregisterShutdown(NSS_ShutdownFunc
> {
>     int i;
> 
>+    /* make sure our lock and condition variable are initialized one and only
>+     * one time */ 
>+    if (PR_CallOnce(&nssInitOnce, nss_doLockInit) != PR_SUCCESS) {
>+	return SECFailure;
>+    }
>     PZ_Lock(nssInitLock);
>     if (!NSS_IsInitialized()) {
> 	PZ_Unlock(nssInitLock);
>@@ -1140,6 +1151,11 @@ SECStatus
> NSS_Shutdown(void)
> {
>     SECStatus rv;
>+    /* make sure our lock and condition variable are initialized one and only
>+     * one time */ 
>+    if (PR_CallOnce(&nssInitOnce, nss_doLockInit) != PR_SUCCESS) {
>+	return SECFailure;
>+    }
>     PZ_Lock(nssInitLock);
> 
>     if (!nssIsInitted) {
>@@ -1192,6 +1208,11 @@ NSS_ShutdownContext(NSSInitContext *cont
> {
>     SECStatus rv = SECSuccess;
> 
>+    /* make sure our lock and condition variable are initialized one and only
>+     * one time */ 
>+    if (PR_CallOnce(&nssInitOnce, nss_doLockInit) != PR_SUCCESS) {
>+	return SECFailure;
>+    }
>     PZ_Lock(nssInitLock);
>     /* If one or more threads are in the middle of init, wait for them
>      * to complete */

Actions: View | Diff

Attachments on bug 784676: 700186