--- xnu/xnu-344.49/libkern/c++/OSData.cpp
+++ xnu/xnu-1699.24.23/libkern/c++/OSData.cpp
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* IOData.m created by rsulack on Thu 25-Sep-1997 */
 
@@ -35,7 +38,7 @@
 #define super OSObject
 
 OSDefineMetaClassAndStructors(OSData, OSObject)
-OSMetaClassDefineReservedUnused(OSData, 0);
+OSMetaClassDefineReservedUsed(OSData, 0);    // setDeallocFunction
 OSMetaClassDefineReservedUnused(OSData, 1);
 OSMetaClassDefineReservedUnused(OSData, 2);
 OSMetaClassDefineReservedUnused(OSData, 3);
@@ -47,9 +50,7 @@
 #define EXTERNAL ((unsigned int) -1)
 
 #if OSALLOCDEBUG
-extern "C" {
-    extern int debug_container_malloc_size;
-};
+extern int debug_container_malloc_size;
 #define ACCUMSIZE(s) do { debug_container_malloc_size += (s); } while(0)
 #else
 #define ACCUMSIZE(s)
@@ -60,19 +61,26 @@
     if (!super::init())
         return false;
 
-    if(inCapacity) {
+    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(inCapacity);
         if (!data)
             return false;
+        capacity = inCapacity;
+        ACCUMSIZE(inCapacity);
     }
 
     length = 0;
-    capacity = inCapacity;
-    capacityIncrement = capacity;
-    if(!capacityIncrement)
+    if (inCapacity < 16)
         capacityIncrement = 16;
-
-    ACCUMSIZE(capacity);
+    else
+        capacityIncrement = inCapacity;
 
     return true;
 }
@@ -82,7 +90,8 @@
     if ((inLength && !bytes) || !initWithCapacity(inLength))
         return false;
 
-    bcopy(bytes, data, inLength);
+    if (bytes != data)
+	bcopy(bytes, data, inLength);
     length = inLength;
 
     return true;
@@ -121,7 +130,7 @@
     OSData *me = new OSData;
 
     if (me && !me->initWithCapacity(inCapacity)) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -133,7 +142,7 @@
     OSData *me = new OSData;
 
     if (me && !me->initWithBytes(bytes, inLength)) {
-        me->free();
+        me->release();
         return 0;
     }
     return me;
@@ -144,7 +153,7 @@
     OSData *me = new OSData;
 
     if (me && !me->initWithBytesNoCopy(bytes, inLength)) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -156,7 +165,7 @@
     OSData *me = new OSData;
 
     if (me && !me->initWithData(inData)) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -169,7 +178,7 @@
     OSData *me = new OSData;
 
     if (me && !me->initWithData(inData, start, inLength)) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -179,9 +188,14 @@
 void OSData::free()
 {
     if (capacity != EXTERNAL && data && capacity) {
-        kfree((vm_offset_t)data, capacity);
+        kfree(data, capacity);
         ACCUMSIZE( -capacity );
-    }
+    } else if (capacity == EXTERNAL) {
+	    DeallocFunction freemem = (DeallocFunction)reserved;
+		if (freemem && data && length) {
+			freemem(data, length);
+		}
+	}
     super::free();
 }
 
@@ -197,6 +211,8 @@
 {
     return capacityIncrement = increment; 
 }
+
+// xx-review: does not check for capacity == EXTERNAL
 
 unsigned int OSData::ensureCapacity(unsigned int newCapacity)
 {
@@ -214,7 +230,7 @@
         bzero(newData + capacity, newCapacity - capacity);
         if (data) {
             bcopy(data, newData, capacity);
-            kfree((vm_offset_t)data, capacity);
+            kfree(data, capacity);
         }
         ACCUMSIZE( newCapacity - capacity );
         data = (void *) newData;
@@ -228,7 +244,7 @@
 {
     unsigned int newSize;
 
-    if (inLength == 0)
+    if (!inLength)
         return true;
 
     if (capacity == EXTERNAL)
@@ -238,7 +254,11 @@
     if ( (newSize > capacity) && newSize > ensureCapacity(newSize) )
         return false;
 
-    bcopy(bytes, &((unsigned char *)data)[length], inLength);
+    if (bytes)
+        bcopy(bytes, &((unsigned char *)data)[length], inLength);
+    else
+        bzero(&((unsigned char *)data)[length], inLength);
+
     length = newSize;
 
     return true;
@@ -248,7 +268,7 @@
 {
     unsigned int newSize;
 
-    if (inLength == 0)
+    if (!inLength)
         return true;
 
     if (capacity == EXTERNAL)
@@ -271,7 +291,7 @@
 
 const void *OSData::getBytesNoCopy() const
 {
-    if (length == 0)
+    if (!length)
         return 0;
     else
         return data;
@@ -308,11 +328,11 @@
 
 bool OSData::isEqualTo(const OSMetaClassBase *obj) const
 {
-    OSData *	data;
+    OSData *	otherData;
     OSString *  str;
 
-    if ((data = OSDynamicCast(OSData, obj)))
-        return isEqualTo(data);
+    if ((otherData = OSDynamicCast(OSData, obj)))
+        return isEqualTo(otherData);
     else if ((str = OSDynamicCast (OSString, obj)))
         return isEqualTo(str);
     else
@@ -326,7 +346,7 @@
     unsigned int checkLen = length;
     unsigned int stringLen;
 
-    if (NULL == obj)
+    if (!obj)
       return false;
 
     stringLen = obj->getLength ();
@@ -410,3 +430,12 @@
 
     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)
+{
+    reserved = (ExpansionData *)func;
+	return;
+}