[evolution-data-server] Don't pass NULL to PR_Lock() during camel_shutdown().



commit 6714a32787dea98f38c1c85bd064141a955322ee
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Oct 24 19:17:04 2009 -0400

    Don't pass NULL to PR_Lock() during camel_shutdown().

 camel/camel.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/camel/camel.c b/camel/camel.c
index 7f999ff..0986d80 100644
--- a/camel/camel.c
+++ b/camel/camel.c
@@ -162,10 +162,12 @@ camel_shutdown (void)
 	/* These next calls must come last. */
 
 #if defined (HAVE_NSS)
-	PR_Lock(nss_initlock);
-	if (nss_initialized)
-		NSS_Shutdown ();
-	PR_Unlock(nss_initlock);
+	if (nss_initlock != NULL) {
+		PR_Lock(nss_initlock);
+		if (nss_initialized)
+			NSS_Shutdown ();
+		PR_Unlock(nss_initlock);
+	}
 #endif /* HAVE_NSS */
 
 	initialised = FALSE;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]