X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/fa7225c82381bac4432a6edf16f53b5370238d85..914fc88e61be54aed6b18205ff2775b48793a3b6:/OSX/libsecurity_cdsa_client/lib/cssmclient.cpp

diff --git a/OSX/libsecurity_cdsa_client/lib/cssmclient.cpp b/OSX/libsecurity_cdsa_client/lib/cssmclient.cpp
index ce83b5e2..2a483fdc 100644
--- a/OSX/libsecurity_cdsa_client/lib/cssmclient.cpp
+++ b/OSX/libsecurity_cdsa_client/lib/cssmclient.cpp
@@ -89,7 +89,7 @@ try
 }
 catch(...)
 {
-	return;
+    return;	// Prevent re-throw of exception [function-try-block]
 }
 
 void
@@ -111,6 +111,7 @@ ObjectImpl::removeChild()
 Allocator &
 ObjectImpl::allocator() const
 {
+    StLock<Mutex> _(mAllocatorMutex);
 	if (mAllocator == NULL)
 	{
 		// fix allocator now
@@ -126,6 +127,7 @@ ObjectImpl::allocator() const
 void
 ObjectImpl::allocator(Allocator &alloc)
 {
+    StLock<Mutex> _(mAllocatorMutex);
 	assert(mAllocator == NULL);	// cannot redefine allocator once set
 	mAllocator = &alloc;
 }