--- xnu/xnu-344.23/libkern/c++/OSSymbol.cpp
+++ xnu/xnu-792/libkern/c++/OSSymbol.cpp
@@ -93,7 +93,7 @@
     inline void closeGate() { mutex_lock(poolGate); };
     inline void openGate()  { mutex_unlock(poolGate); };
 
-    OSSymbol *findSymbol(const char *cString, OSSymbol ***replace) const;
+    OSSymbol *findSymbol(const char *cString) const;
     OSSymbol *insertSymbol(OSSymbol *sym);
     void removeSymbol(OSSymbol *sym);
 
@@ -210,7 +210,7 @@
         insertSymbol(insert);
 }
 
-OSSymbol *OSSymbolPool::findSymbol(const char *cString, OSSymbol ***replace) const
+OSSymbol *OSSymbolPool::findSymbol(const char *cString) const
 {
     Bucket *thisBucket;
     unsigned int j, inLen, hash;
@@ -220,8 +220,6 @@
     thisBucket = &buckets[hash % nBuckets];
     j = thisBucket->count;
 
-    *replace = NULL;
-
     if (!j)
         return 0;
 
@@ -229,28 +227,16 @@
         probeSymbol = (OSSymbol *) thisBucket->symbolP;
 
         if (inLen == probeSymbol->length
-        &&  (strcmp(probeSymbol->string, cString) == 0)) {
-	    probeSymbol->retain();
-	    if (probeSymbol->getRetainCount() != 0xffff)
-		return probeSymbol;
-	    else
-		// replace this one
-		*replace = (OSSymbol **) &thisBucket->symbolP;
-        }
+        &&  (strcmp(probeSymbol->string, cString) == 0))
+            return probeSymbol;
 	return 0;
     }
 
     for (list = thisBucket->symbolP; j--; list++) {
         probeSymbol = *list;
         if (inLen == probeSymbol->length
-        &&  (strcmp(probeSymbol->string, cString) == 0)) {
-	    probeSymbol->retain();
-	    if (probeSymbol->getRetainCount() != 0xffff)
-		return probeSymbol;
-	    else
-		// replace this one
-		*replace = list;
-	}
+        &&  (strcmp(probeSymbol->string, cString) == 0))
+            return probeSymbol;
     }
 
     return 0;
@@ -271,7 +257,7 @@
         thisBucket->symbolP = (OSSymbol **) sym;
         thisBucket->count++;
         count++;
-        return 0;
+        return sym;
     }
 
     if (j == 1) {
@@ -292,7 +278,7 @@
         if (count > nBuckets)
             reconstructSymbols();
 
-        return 0;
+        return sym;
     }
 
     for (list = thisBucket->symbolP; j--; list++) {
@@ -315,7 +301,7 @@
     if (count > nBuckets)
         reconstructSymbols();
 
-    return 0;
+    return sym;
 }
 
 void OSSymbolPool::removeSymbol(OSSymbol *sym)
@@ -439,48 +425,62 @@
 
 const OSSymbol *OSSymbol::withCString(const char *cString)
 {
-    OSSymbol **replace;
-
     pool->closeGate();
 
-    OSSymbol *newSymb = pool->findSymbol(cString, &replace);
-    if (!newSymb && (newSymb = new OSSymbol) ) {
-	if (newSymb->OSString::initWithCString(cString)) {
-	    if (replace)
-		*replace = newSymb;
-	    else
-		pool->insertSymbol(newSymb);
-	} else {
+    OSSymbol *oldSymb = pool->findSymbol(cString);
+    if (!oldSymb) {
+        OSSymbol *newSymb = new OSSymbol;
+        if (!newSymb) {
+            pool->openGate();
+            return newSymb;
+        }
+
+	if (newSymb->OSString::initWithCString(cString))
+	    oldSymb = pool->insertSymbol(newSymb);
+        
+        if (newSymb == oldSymb) {
+            pool->openGate();
+            return newSymb;	// return the newly created & inserted symbol.
+        }
+        else
+            // Somebody else inserted the new symbol so free our copy
 	    newSymb->OSString::free();
-	    newSymb = 0;
-	}
-    }
+    }
+    
+    oldSymb->retain();	// Retain the old symbol before releasing the lock.
+
     pool->openGate();
-
-    return newSymb;
+    return oldSymb;
 }
 
 const OSSymbol *OSSymbol::withCStringNoCopy(const char *cString)
 {
-    OSSymbol **replace;
-
     pool->closeGate();
 
-    OSSymbol *newSymb = pool->findSymbol(cString, &replace);
-    if (!newSymb && (newSymb = new OSSymbol) ) {
-	if (newSymb->OSString::initWithCStringNoCopy(cString)) {
-	    if (replace)
-		*replace = newSymb;
-	    else
-		pool->insertSymbol(newSymb);
-	} else {
+    OSSymbol *oldSymb = pool->findSymbol(cString);
+    if (!oldSymb) {
+        OSSymbol *newSymb = new OSSymbol;
+        if (!newSymb) {
+            pool->openGate();
+            return newSymb;
+        }
+
+	if (newSymb->OSString::initWithCStringNoCopy(cString))
+	    oldSymb = pool->insertSymbol(newSymb);
+        
+        if (newSymb == oldSymb) {
+            pool->openGate();
+            return newSymb;	// return the newly created & inserted symbol.
+        }
+        else
+            // Somebody else inserted the new symbol so free our copy
 	    newSymb->OSString::free();
-	    newSymb = 0;
-	}
-    }
+    }
+    
+    oldSymb->retain();	// Retain the old symbol before releasing the lock.
+
     pool->openGate();
-
-    return newSymb;
+    return oldSymb;
 }
 
 void OSSymbol::checkForPageUnload(void *startAddr, void *endAddr)
@@ -503,12 +503,21 @@
     pool->openGate();
 }
 
+void OSSymbol::taggedRelease(const void *tag) const
+{
+    super::taggedRelease(tag);
+}
+
+void OSSymbol::taggedRelease(const void *tag, const int when) const
+{
+    pool->closeGate();
+    super::taggedRelease(tag, when);
+    pool->openGate();
+}
+
 void OSSymbol::free()
 {
-    pool->closeGate();
     pool->removeSymbol(this);
-    pool->openGate();
-    
     super::free();
 }