--- xnu/xnu-517.12.7/libkern/c++/OSData.cpp
+++ xnu/xnu-201.19.3/libkern/c++/OSData.cpp
@@ -21,13 +21,11 @@
  */
 /* 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
 
@@ -44,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)
@@ -55,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;
 }
@@ -84,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;
@@ -124,7 +116,7 @@
     OSData *me = new OSData;
 
     if (me && !me->initWithCapacity(inCapacity)) {
-        me->release();
+        me->free();
         return 0;
     }
 
@@ -136,7 +128,7 @@
     OSData *me = new OSData;
 
     if (me && !me->initWithBytes(bytes, inLength)) {
-        me->release();
+        me->free();
         return 0;
     }
     return me;
@@ -147,7 +139,7 @@
     OSData *me = new OSData;
 
     if (me && !me->initWithBytesNoCopy(bytes, inLength)) {
-        me->release();
+        me->free();
         return 0;
     }
 
@@ -159,7 +151,7 @@
     OSData *me = new OSData;
 
     if (me && !me->initWithData(inData)) {
-        me->release();
+        me->free();
         return 0;
     }
 
@@ -172,7 +164,7 @@
     OSData *me = new OSData;
 
     if (me && !me->initWithData(inData, start, inLength)) {
-        me->release();
+        me->free();
         return 0;
     }
 
@@ -231,7 +223,7 @@
 {
     unsigned int newSize;
 
-    if (!inLength)
+    if (inLength == 0)
         return true;
 
     if (capacity == EXTERNAL)
@@ -241,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;
@@ -255,7 +243,7 @@
 {
     unsigned int newSize;
 
-    if (!inLength)
+    if (inLength == 0)
         return true;
 
     if (capacity == EXTERNAL)
@@ -278,7 +266,7 @@
 
 const void *OSData::getBytesNoCopy() const
 {
-    if (!length)
+    if (length == 0)
         return 0;
     else
         return data;
@@ -333,7 +321,7 @@
     unsigned int checkLen = length;
     unsigned int stringLen;
 
-    if (!obj)
+    if (NULL == obj)
       return false;
 
     stringLen = obj->getLength ();