--- xnu/xnu-792.13.8/libkern/c++/OSSerialize.cpp
+++ xnu/xnu-3248.30.4/libkern/c++/OSSerialize.cpp
@@ -1,31 +1,29 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_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 
+ * @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. 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@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* OSSerialize.cpp created by rsulack on Wen 25-Nov-1998 */
 
@@ -38,6 +36,8 @@
 #include <libkern/c++/OSContainers.h>
 #include <libkern/c++/OSLib.h>
 #include <libkern/c++/OSDictionary.h>
+#include <libkern/OSSerializeBinary.h>
+#include <IOKit/IOLib.h>
 
 #define super OSObject
 
@@ -51,14 +51,6 @@
 OSMetaClassDefineReservedUnused(OSSerialize, 6);
 OSMetaClassDefineReservedUnused(OSSerialize, 7);
 
-#if OSALLOCDEBUG
-extern "C" {
-    extern int debug_container_malloc_size;
-};
-#define ACCUMSIZE(s) do { debug_container_malloc_size += (s); } while(0)
-#else
-#define ACCUMSIZE(s)
-#endif
 
 char * OSSerialize::text() const
 {
@@ -67,8 +59,17 @@
 
 void OSSerialize::clearText()
 {
-	bzero((void *)data, capacity);
-	length = 1;
+	if (binary)
+	{
+		length = sizeof(kOSSerializeBinarySignature);
+		bzero(&data[length], capacity - length);
+		endCollection = true;
+	}
+    else
+    {
+		bzero((void *)data, capacity);
+		length = 1;
+    }
 	tag = 0;
 	tags->flushCollection();
 }
@@ -78,9 +79,12 @@
 	char temp[16];
 	OSString *tagString;
 
+	if (binary) return (binarySerialize(o));
+
 	// look it up
 	tagString = (OSString *)tags->getObject((const OSSymbol *) o);
 
+// xx-review: no error checking here for addString calls!
 	// does it exist?
 	if (tagString) {
 		addString("<reference IDREF=\"");
@@ -90,7 +94,7 @@
 	}
 
 	// build a tag
-	sprintf(temp, "%u", tag++);
+	snprintf(temp, sizeof(temp), "%u", tag++);
 	tagString = OSString::withCString(temp);
 
 	// add to tag dictionary
@@ -102,6 +106,11 @@
 
 bool OSSerialize::addXMLStartTag(const OSMetaClassBase *o, const char *tagString)
 {
+	if (binary)
+    {
+		printf("class %s: xml serialize\n", o->getMetaClass()->getClassName());
+		return (false);
+	}
 
 	if (!addChar('<')) return false;
 	if (!addString(tagString)) return false;
@@ -125,6 +134,12 @@
 
 bool OSSerialize::addChar(const char c)
 {
+	if (binary)
+    {
+		printf("xml serialize\n");
+		return (false);
+	}
+
 	// add char, possibly extending our capacity
 	if (length >= capacity && length >=ensureCapacity(capacity+capacityIncrement))
 		return false;
@@ -162,7 +177,7 @@
     // allocate from the kernel map so that we can safely map this data
     // into user space (the primary use of the OSSerialize object)
     
-    kern_return_t rc = kmem_alloc(kernel_map, (vm_offset_t *)&data, capacity);
+    kern_return_t rc = kmem_alloc(kernel_map, (vm_offset_t *)&data, capacity, IOMemoryTag(kernel_map));
     if (rc) {
         tags->release();
         tags = 0;
@@ -171,7 +186,7 @@
     bzero((void *)data, capacity);
 
 
-    ACCUMSIZE(capacity);
+    OSCONTAINER_ACCUMSIZE(capacity);
 
     return true;
 }
@@ -211,13 +226,14 @@
 					(vm_offset_t)data,
 					capacity,
 					(vm_offset_t *)&newData,
-					newCapacity);
+					newCapacity,
+					VM_KERN_MEMORY_IOKIT);
 	if (!rc) {
-	    ACCUMSIZE(newCapacity);
+	    OSCONTAINER_ACCUMSIZE(newCapacity);
 
 	    // kmem realloc does not free the old address range
 	    kmem_free(kernel_map, (vm_offset_t)data, capacity); 
-	    ACCUMSIZE(-capacity);
+	    OSCONTAINER_ACCUMSIZE(-((size_t)capacity));
 	    
 	    // kmem realloc does not zero out the new memory
 	    // and this could end up going to user land
@@ -237,7 +253,7 @@
 
     if (data) {
 	kmem_free(kernel_map, (vm_offset_t)data, capacity); 
-        ACCUMSIZE( -capacity );
+        OSCONTAINER_ACCUMSIZE( -((size_t)capacity) );
     }
     super::free();
 }