--- xnu/xnu-792.13.8/libkern/c++/OSSet.cpp
+++ xnu/xnu-4570.41.2/libkern/c++/OSSet.cpp
@@ -1,31 +1,29 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000, 2014 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * This file contains Original Code and/or Modifications of Original Code 
- * as defined in and that are subject to the Apple Public Source License 
- * Version 2.0 (the 'License'). You may not use this file except in 
- * compliance with the License.  The rights granted to you under the 
- * License may not be used to create, or enable the creation or 
- * redistribution of, unlawful or unlicensed copies of an Apple operating 
- * system, or to circumvent, violate, or enable the circumvention or 
- * violation of, any terms of an Apple operating system software license 
- * agreement.
- *
- * Please obtain a copy of the License at 
- * http://www.opensource.apple.com/apsl/ and read it before using this 
- * file.
- *
- * The Original Code and all software distributed under the License are 
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
  * limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* IOSet.m created by rsulack on Thu 11-Jun-1998 */
 
@@ -78,7 +76,8 @@
         return false;
 
     for ( unsigned int i = 0; i < inCount; i++ ) {
-        if (members->getCount() < inCapacity)
+// xx-review: no test here for failure of setObject()
+        if (members->getCount() < capacity)
             setObject(inObjects[i]);
         else
             return false;
@@ -157,9 +156,10 @@
 
 void OSSet::free()
 {
-    (void) members->super::setOptions(0, kImmutable);
-    if (members)
+    if (members) {
+        (void) members->super::setOptions(0, kImmutable);
         members->release();
+    }
 
     super::free();
 }
@@ -197,27 +197,36 @@
 
 bool OSSet::setObject(const OSMetaClassBase *anObject)
 {
-    if (containsObject(anObject))
-        return false;
-    else {
+    if (containsObject(anObject)) {
+        return false;
+    } else {
         haveUpdated();
         return members->setObject(anObject);
     }
 }
 
-bool OSSet::merge(const OSArray *array)
-{
-    const OSMetaClassBase *anObject;
-    bool retVal = false;
-
-    for (int i = 0; (anObject = array->getObject(i)); i++)
-        if (setObject(anObject))
-            retVal = true;
-
-    return retVal;
-}
-
-bool OSSet::merge(const OSSet *set)
+bool OSSet::merge(const OSArray * array)
+{
+    const OSMetaClassBase * anObject = 0;
+    bool                    result   = true;
+
+    for (int i = 0; (anObject = array->getObject(i)); i++) {
+
+       /* setObject() returns false if the object is already in the set,
+        * so we have to check beforehand here with containsObject().
+        */
+        if (containsObject(anObject)) {
+            continue;
+        }
+        if (!setObject(anObject)) {
+            result = false;
+        }
+    }
+
+    return result;
+}
+
+bool OSSet::merge(const OSSet * set)
 {
     return merge(set->members);
 }
@@ -272,6 +281,8 @@
 
     for ( i = 0; i < count; i++ ) {
         obj1 = aSet->members->getObject(i);
+	if (containsObject(obj1))
+		continue;
         obj2 = members->getObject(i);
         if ( !obj1 || !obj2 )
                 return false;