--- xnu/xnu-3248.50.21/libkern/c++/OSData.cpp
+++ xnu/xnu-1486.2.11/libkern/c++/OSData.cpp
@@ -49,30 +49,32 @@
 
 #define EXTERNAL ((unsigned int) -1)
 
+#if OSALLOCDEBUG
+extern int debug_container_malloc_size;
+#define ACCUMSIZE(s) do { debug_container_malloc_size += (s); } while(0)
+#else
+#define ACCUMSIZE(s)
+#endif
+
 bool OSData::initWithCapacity(unsigned int inCapacity)
 {
-    if (data)
-    {
-        OSCONTAINER_ACCUMSIZE(-((size_t)capacity));
-	if (!inCapacity || (capacity < inCapacity))
-	{
-	    // clean out old data's storage if it isn't big enough
-	    kfree(data, capacity);
-	    data = 0;
-	    capacity = 0;
-	}
-    }
-
     if (!super::init())
         return false;
 
+    if (data && (!inCapacity || capacity < inCapacity) ) {
+        // clean out old data's storage if it isn't big enough
+        kfree(data, capacity);
+        data = 0;
+        ACCUMSIZE(-capacity);
+    }
+
     if (inCapacity && !data) {
-        data = (void *) kalloc_container(inCapacity);
+        data = (void *) kalloc(inCapacity);
         if (!data)
             return false;
         capacity = inCapacity;
-    }
-    OSCONTAINER_ACCUMSIZE(capacity);
+        ACCUMSIZE(inCapacity);
+    }
 
     length = 0;
     if (inCapacity < 16)
@@ -187,14 +189,13 @@
 {
     if (capacity != EXTERNAL && data && capacity) {
         kfree(data, capacity);
-        OSCONTAINER_ACCUMSIZE( -((size_t)capacity) );
+        ACCUMSIZE( -capacity );
     } else if (capacity == EXTERNAL) {
-	DeallocFunction freemem = reserved ? reserved->deallocFunction : NULL;
-	if (freemem && data && length) {
-		freemem(data, length);
+	    DeallocFunction freemem = (DeallocFunction)reserved;
+		if (freemem && data && length) {
+			freemem(data, length);
+		}
 	}
-    }
-    if (reserved) kfree(reserved, sizeof(ExpansionData));
     super::free();
 }
 
@@ -216,29 +217,24 @@
 unsigned int OSData::ensureCapacity(unsigned int newCapacity)
 {
     unsigned char * newData;
-    unsigned int finalCapacity;
 
     if (newCapacity <= capacity)
         return capacity;
 
-    finalCapacity = (((newCapacity - 1) / capacityIncrement) + 1)
+    newCapacity = (((newCapacity - 1) / capacityIncrement) + 1)
                 * capacityIncrement;
 
-    // integer overflow check
-    if (finalCapacity < newCapacity)
-        return capacity;
-
-    newData = (unsigned char *) kalloc_container(finalCapacity);
-
+    newData = (unsigned char *) kalloc(newCapacity);
+    
     if ( newData ) {
-        bzero(newData + capacity, finalCapacity - capacity);
+        bzero(newData + capacity, newCapacity - capacity);
         if (data) {
             bcopy(data, newData, capacity);
             kfree(data, capacity);
         }
-        OSCONTAINER_ACCUMSIZE( ((size_t)finalCapacity) - ((size_t)capacity) );
+        ACCUMSIZE( newCapacity - capacity );
         data = (void *) newData;
-        capacity = finalCapacity;
+        capacity = newCapacity;
     }
 
     return capacity;
@@ -392,16 +388,12 @@
     unsigned int i;
     const unsigned char *p;
     unsigned char c;
-    unsigned int serializeLength;
 
     if (s->previouslySerialized(this)) return true;
 
     if (!s->addXMLStartTag(this, "data")) return false;
 
-    serializeLength = length;
-    if (reserved && reserved->disableSerialization) serializeLength = 0;
-
-    for (i = 0, p = (unsigned char *)data; i < serializeLength; i++, p++) {
+    for (i = 0, p = (unsigned char *)data; i < length; i++, p++) {
         /* 3 bytes are encoded as 4 */
         switch (i % 3) {
 	case 0:
@@ -439,24 +431,11 @@
     return s->addXMLEndTag("data");
 }
 
+/* Note I am just using the reserved pointer here instead of allocating a whole buffer
+ * to hold one pointer.
+ */
 void OSData::setDeallocFunction(DeallocFunction func)
 {
-    if (!reserved)
-    {
-    	reserved = (typeof(reserved)) kalloc_container(sizeof(ExpansionData));
-        if (!reserved) return;
-        bzero(reserved, sizeof(ExpansionData));
-    }
-    reserved->deallocFunction = func;
-}
-
-void OSData::setSerializable(bool serializable)
-{
-    if (!reserved)
-    {
-    	reserved = (typeof(reserved)) kalloc_container(sizeof(ExpansionData));
-	if (!reserved) return;
-	bzero(reserved, sizeof(ExpansionData));
-    }
-    reserved->disableSerialization = (!serializable);
-}
+    reserved = (ExpansionData *)func;
+	return;
+}