--- xnu/xnu-3789.41.3/libkern/c++/OSCollectionIterator.cpp
+++ xnu/xnu-792.21.3/libkern/c++/OSCollectionIterator.cpp
@@ -36,6 +36,15 @@
 
 OSDefineMetaClassAndStructors(OSCollectionIterator, OSIterator)
 
+#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
+
 bool OSCollectionIterator::initWithCollection(const OSCollection *inColl)
 {
     if ( !super::init() || !inColl)
@@ -47,7 +56,7 @@
     initialUpdateStamp = 0;
     valid = false;
 
-    return true;
+    return this;
 }
 
 OSCollectionIterator *
@@ -67,8 +76,8 @@
 void OSCollectionIterator::free()
 {
     if (collIterator) {
-        kfree(collIterator, collection->iteratorSize());
-	OSCONTAINER_ACCUMSIZE(-((size_t) collection->iteratorSize()));
+        kfree((vm_offset_t)collIterator, collection->iteratorSize());
+	ACCUMSIZE(-(collection->iteratorSize()));
         collIterator = 0;
     }
 
@@ -85,8 +94,8 @@
     valid = false;
 
     if (!collIterator) {
-        collIterator = (void *)kalloc_container(collection->iteratorSize());
-	OSCONTAINER_ACCUMSIZE(collection->iteratorSize());
+        collIterator = (void *)kalloc(collection->iteratorSize());
+	ACCUMSIZE(collection->iteratorSize());
         if (!collIterator)
             return;
     }
@@ -101,8 +110,8 @@
 bool OSCollectionIterator::isValid()
 {
     if (!collIterator) {
-        collIterator = (void *)kalloc_container(collection->iteratorSize());
-	OSCONTAINER_ACCUMSIZE(collection->iteratorSize());
+        collIterator = (void *)kalloc(collection->iteratorSize());
+	ACCUMSIZE(collection->iteratorSize());
         if (!collection->initIterator(collIterator))
             return false;
         initialUpdateStamp = collection->updateStamp;