--- xnu/xnu-344.49/libkern/c++/OSData.cpp
+++ xnu/xnu-517.7.7/libkern/c++/OSData.cpp
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * 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.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This 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.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -47,9 +44,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 +55,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((vm_address_t) 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 +84,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 +124,7 @@
     OSData *me = new OSData;
 
     if (me && !me->initWithCapacity(inCapacity)) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -133,7 +136,7 @@
     OSData *me = new OSData;
 
     if (me && !me->initWithBytes(bytes, inLength)) {
-        me->free();
+        me->release();
         return 0;
     }
     return me;
@@ -144,7 +147,7 @@
     OSData *me = new OSData;
 
     if (me && !me->initWithBytesNoCopy(bytes, inLength)) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -156,7 +159,7 @@
     OSData *me = new OSData;
 
     if (me && !me->initWithData(inData)) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -169,7 +172,7 @@
     OSData *me = new OSData;
 
     if (me && !me->initWithData(inData, start, inLength)) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -228,7 +231,7 @@
 {
     unsigned int newSize;
 
-    if (inLength == 0)
+    if (!inLength)
         return true;
 
     if (capacity == EXTERNAL)
@@ -238,7 +241,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 +255,7 @@
 {
     unsigned int newSize;
 
-    if (inLength == 0)
+    if (!inLength)
         return true;
 
     if (capacity == EXTERNAL)
@@ -271,7 +278,7 @@
 
 const void *OSData::getBytesNoCopy() const
 {
-    if (length == 0)
+    if (!length)
         return 0;
     else
         return data;
@@ -326,7 +333,7 @@
     unsigned int checkLen = length;
     unsigned int stringLen;
 
-    if (NULL == obj)
+    if (!obj)
       return false;
 
     stringLen = obj->getLength ();