Security-59306.61.1.tar.gz

[apple/security.git] / securityd / src / structure.cpp

diff --git a/securityd/src/structure.cpp b/securityd/src/structure.cpp
index ec86e07bc05d2fe778b7863e6a52f8ed4678985e..3c5dc50ff11ad9378cd75a7fe7d997880f50278f 100644 (file)
--- a/securityd/src/structure.cpp
+++ b/securityd/src/structure.cpp
@@ -62,8 +62,6 @@ void NodeCore::referent(NodeCore &r)
 void NodeCore::clearReferent()
 {
        StLock<Mutex> _(*this);
-       if (mReferent)
-               assert(!mReferent->hasReference(*this));
        mReferent = NULL;
 }
 
@@ -78,21 +76,9 @@ void NodeCore::addReference(NodeCore &p)
 void NodeCore::removeReference(NodeCore &p)
 {
        StLock<Mutex> _(*this);
-       assert(hasReference(p));
        mReferences.erase(&p);
 }
 
-#if !defined(NDEBUG)
-
-bool NodeCore::hasReference(NodeCore &p)
-{
-       assert(p.refCountForDebuggingOnly() > 0);
-       return mReferences.find(&p) != mReferences.end();
-}
-
-#endif //NDEBUG
-
-
 //
 // ClearReferences clears the reference set but does not propagate
 // anything; it is NOT recursive.
@@ -100,8 +86,7 @@ bool NodeCore::hasReference(NodeCore &p)
 void NodeCore::clearReferences()
 {
        StLock<Mutex> _(*this);
-       secinfo("ssnode", "%p clearing all %d references",
-               this, int(mReferences.size()));
+       secinfo("ssnode", "%p clearing all %d references", this, int(mReferences.size()));
        mReferences.erase(mReferences.begin(), mReferences.end());
 }
 
@@ -125,7 +110,6 @@ void NodeCore::kill()
 void NodeCore::kill(NodeCore &ref)
 {
        StLock<Mutex> _(*this);
-       assert(hasReference(ref));
        ref.kill();
        removeReference(ref);
 }