Security-58286.270.3.0.1.tar.gz

[apple/security.git] / OSX / libsecurity_cdsa_client / lib / dlclient.cpp

diff --git a/OSX/libsecurity_cdsa_client/lib/dlclient.cpp b/OSX/libsecurity_cdsa_client/lib/dlclient.cpp
index 2846d3cf9be9da99e2e3d3d80fdc1143360f2b0a..3fb96df8d5d27a0cf86b7a8b20fc52d03154ec65 100644 (file)
--- a/OSX/libsecurity_cdsa_client/lib/dlclient.cpp
+++ b/OSX/libsecurity_cdsa_client/lib/dlclient.cpp
@@ -195,6 +195,7 @@ DbImpl::close()
 void
 DbImpl::activate()
 {
+    StLock<Mutex> _(mActivateMutex);
        if (!mActive)
        {
                if (mDbInfo)
@@ -627,7 +628,6 @@ CSSM_HANDLE Db::dlGetFirst(const CSSM_QUERY &query, CSSM_DB_RECORD_ATTRIBUTE_DAT
                return CSSM_INVALID_HANDLE;
        default:
                CssmError::throwMe(rc);
-               return CSSM_INVALID_HANDLE; // placebo
        }
 }
 
@@ -642,7 +642,6 @@ bool Db::dlGetNext(CSSM_HANDLE query, CSSM_DB_RECORD_ATTRIBUTE_DATA &attributes,
                return false;
        default:
                CssmError::throwMe(rc);
-               return false;   // placebo
        }
 }