--- xnu/xnu-792.12.6/libkern/c++/OSData.cpp
+++ xnu/xnu-124.1/libkern/c++/OSData.cpp
@@ -1,41 +1,31 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @APPLE_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.  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_LICENSE_OSREFERENCE_HEADER_END@
+ * 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 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 OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
  */
 /* IOData.m created by rsulack on Thu 25-Sep-1997 */
 
-#include <string.h>
 
 #include <libkern/c++/OSData.h>
 #include <libkern/c++/OSSerialize.h>
 #include <libkern/c++/OSLib.h>
 #include <libkern/c++/OSString.h>
-#include <string.h>
 
 #define super OSObject
 
@@ -52,7 +42,9 @@
 #define EXTERNAL ((unsigned int) -1)
 
 #if OSALLOCDEBUG
-extern int debug_container_malloc_size;
+extern "C" {
+    extern int debug_container_malloc_size;
+};
 #define ACCUMSIZE(s) do { debug_container_malloc_size += (s); } while(0)
 #else
 #define ACCUMSIZE(s)
@@ -63,26 +55,19 @@
     if (!super::init())
         return false;
 
-    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) {
+    if(inCapacity) {
         data = (void *) kalloc(inCapacity);
         if (!data)
             return false;
-        capacity = inCapacity;
-        ACCUMSIZE(inCapacity);
     }
 
     length = 0;
-    if (inCapacity < 16)
+    capacity = inCapacity;
+    capacityIncrement = capacity;
+    if(!capacityIncrement)
         capacityIncrement = 16;
-    else
-        capacityIncrement = inCapacity;
+
+    ACCUMSIZE(capacity);
 
     return true;
 }
@@ -92,8 +77,7 @@
     if ((inLength && !bytes) || !initWithCapacity(inLength))
         return false;
 
-    if (bytes != data)
-	bcopy(bytes, data, inLength);
+    bcopy(bytes, data, inLength);
     length = inLength;
 
     return true;
@@ -132,7 +116,7 @@
     OSData *me = new OSData;
 
     if (me && !me->initWithCapacity(inCapacity)) {
-        me->release();
+        me->free();
         return 0;
     }
 
@@ -144,7 +128,7 @@
     OSData *me = new OSData;
 
     if (me && !me->initWithBytes(bytes, inLength)) {
-        me->release();
+        me->free();
         return 0;
     }
     return me;
@@ -155,7 +139,7 @@
     OSData *me = new OSData;
 
     if (me && !me->initWithBytesNoCopy(bytes, inLength)) {
-        me->release();
+        me->free();
         return 0;
     }
 
@@ -167,7 +151,7 @@
     OSData *me = new OSData;
 
     if (me && !me->initWithData(inData)) {
-        me->release();
+        me->free();
         return 0;
     }
 
@@ -180,7 +164,7 @@
     OSData *me = new OSData;
 
     if (me && !me->initWithData(inData, start, inLength)) {
-        me->release();
+        me->free();
         return 0;
     }
 
@@ -239,7 +223,7 @@
 {
     unsigned int newSize;
 
-    if (!inLength)
+    if (inLength == 0)
         return true;
 
     if (capacity == EXTERNAL)
@@ -249,11 +233,7 @@
     if ( (newSize > capacity) && newSize > ensureCapacity(newSize) )
         return false;
 
-    if (bytes)
-        bcopy(bytes, &((unsigned char *)data)[length], inLength);
-    else
-        bzero(&((unsigned char *)data)[length], inLength);
-
+    bcopy(bytes, &((unsigned char *)data)[length], inLength);
     length = newSize;
 
     return true;
@@ -263,7 +243,7 @@
 {
     unsigned int newSize;
 
-    if (!inLength)
+    if (inLength == 0)
         return true;
 
     if (capacity == EXTERNAL)
@@ -286,7 +266,7 @@
 
 const void *OSData::getBytesNoCopy() const
 {
-    if (!length)
+    if (length == 0)
         return 0;
     else
         return data;
@@ -341,7 +321,7 @@
     unsigned int checkLen = length;
     unsigned int stringLen;
 
-    if (!obj)
+    if (NULL == obj)
       return false;
 
     stringLen = obj->getLength ();