--- xnu/xnu-3248.50.21/libkern/c++/OSArray.cpp
+++ xnu/xnu-792.13.8/libkern/c++/OSArray.cpp
@@ -1,29 +1,31 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_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_OSREFERENCE_LICENSE_HEADER_END@
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
  */
 /* IOArray.m created by rsulack on Fri 12-Sep-1997 */
 /* IOArray.cpp converted to C++ by gvdl on Fri 1998-10-30 */
@@ -33,7 +35,6 @@
 #include <libkern/c++/OSDictionary.h>
 #include <libkern/c++/OSSerialize.h>
 #include <libkern/c++/OSLib.h>
-#include <libkern/OSDebug.h>
 
 #define super OSCollection
 
@@ -47,23 +48,27 @@
 OSMetaClassDefineReservedUnused(OSArray, 6);
 OSMetaClassDefineReservedUnused(OSArray, 7);
 
+#if OSALLOCDEBUG
+extern "C" {
+    extern int debug_container_malloc_size;
+};
+#define ACCUMSIZE(s) do { debug_container_malloc_size += (s); } while(0)
+#else
+#define ACCUMSIZE(s)
+#endif
 
 #define EXT_CAST(obj) \
     reinterpret_cast<OSObject *>(const_cast<OSMetaClassBase *>(obj))
 
 bool OSArray::initWithCapacity(unsigned int inCapacity)
 {
-    unsigned int size;
+    int size;
 
     if (!super::init())
         return false;
 
-    // integer overflow check
-    if (inCapacity > (UINT_MAX / sizeof(const OSMetaClassBase*)))
-        return false;
-
     size = sizeof(const OSMetaClassBase *) * inCapacity;
-    array = (const OSMetaClassBase **) kalloc_container(size);
+    array = (const OSMetaClassBase **) kalloc(size);
     if (!array)
         return false;
 
@@ -72,7 +77,7 @@
     capacityIncrement = (inCapacity)? inCapacity : 16;
 
     bzero(array, size);
-    OSCONTAINER_ACCUMSIZE(size);
+    ACCUMSIZE(size);
 
     return true;
 }
@@ -164,7 +169,7 @@
 
     if (array) {
         kfree(array, sizeof(const OSMetaClassBase *) * capacity);
-        OSCONTAINER_ACCUMSIZE( -(sizeof(const OSMetaClassBase *) * capacity) );
+        ACCUMSIZE( -(sizeof(const OSMetaClassBase *) * capacity) );
     }
 
     super::free();
@@ -184,33 +189,27 @@
 unsigned int OSArray::ensureCapacity(unsigned int newCapacity)
 {
     const OSMetaClassBase **newArray;
-    unsigned int finalCapacity;
-    unsigned int oldSize, newSize;
+    int oldSize, newSize;
 
     if (newCapacity <= capacity)
         return capacity;
 
     // round up
-    finalCapacity = (((newCapacity - 1) / capacityIncrement) + 1)
+    newCapacity = (((newCapacity - 1) / capacityIncrement) + 1)
                 * capacityIncrement;
-
-    // integer overflow check
-    if ((finalCapacity < newCapacity) || (finalCapacity > (UINT_MAX / sizeof(const OSMetaClassBase*))))
-        return capacity;
-
-    newSize = sizeof(const OSMetaClassBase *) * finalCapacity;
-
-    newArray = (const OSMetaClassBase **) kalloc_container(newSize);
+    newSize = sizeof(const OSMetaClassBase *) * newCapacity;
+
+    newArray = (const OSMetaClassBase **) kalloc(newSize);
     if (newArray) {
         oldSize = sizeof(const OSMetaClassBase *) * capacity;
 
-        OSCONTAINER_ACCUMSIZE(((size_t)newSize) - ((size_t)oldSize));
+        ACCUMSIZE(newSize - oldSize);
 
         bcopy(array, newArray, oldSize);
         bzero(&newArray[capacity], newSize - oldSize);
         kfree(array, oldSize);
         array = newArray;
-        capacity = finalCapacity;
+        capacity = newCapacity;
     }
 
     return capacity;
@@ -221,9 +220,8 @@
     unsigned int i;
 
     haveUpdated();
-    for (i = 0; i < count; i++) {
+    for (i = 0; i < count; i++)
         array[i]->taggedRelease(OSTypeID(OSCollection));
-    }
     count = 0;
 }
 
@@ -402,8 +400,8 @@
     
     if (!s->addXMLStartTag(this, "array")) return false;
 
-    for (unsigned i = 0; i < count; i++) {
-        if (array[i] == NULL || !array[i]->serialize(s)) return false;
+    for (unsigned i = 0; i < count; i++) { 
+        if (!array[i]->serialize(s)) return false;
     }
 
     return s->addXMLEndTag("array");