--- xnu/xnu-2422.100.13/libkern/c++/OSData.cpp
+++ xnu/xnu-1504.9.26/libkern/c++/OSData.cpp
@@ -56,12 +56,6 @@
 #define ACCUMSIZE(s)
 #endif
 
-struct OSData::ExpansionData
-{
-    DeallocFunction deallocFunction;
-    bool            disableSerialization;
-};
-
 bool OSData::initWithCapacity(unsigned int inCapacity)
 {
     if (!super::init())
@@ -197,12 +191,11 @@
         kfree(data, 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();
 }
 
@@ -395,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:
@@ -442,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(sizeof(ExpansionData));
-        if (!reserved) return;
-        bzero(reserved, sizeof(ExpansionData));
-    }
-    reserved->deallocFunction = func;
-}
-
-void OSData::setSerializable(bool serializable)
-{
-    if (!reserved)
-    {
-    	reserved = (typeof(reserved)) kalloc(sizeof(ExpansionData));
-	if (!reserved) return;
-	bzero(reserved, sizeof(ExpansionData));
-    }
-    reserved->disableSerialization = (!serializable);
-}
+    reserved = (ExpansionData *)func;
+	return;
+}