Loading...
libkern/c++/OSSerializeBinary.cpp xnu-3248.50.21 xnu-2782.20.48
--- xnu/xnu-3248.50.21/libkern/c++/OSSerializeBinary.cpp
+++ xnu/xnu-2782.20.48/libkern/c++/OSSerializeBinary.cpp
@@ -241,7 +241,7 @@
 	if (idx >= v##Capacity)														\
 	{																			\
 		uint32_t ncap = v##Capacity + 64;										\
-		typeof(v##Array) nbuf = (typeof(v##Array)) kalloc_container(ncap * sizeof(o));	\
+		typeof(v##Array) nbuf = (typeof(v##Array)) kalloc(ncap * sizeof(o));	\
 		if (!nbuf) ok = false;													\
 		if (v##Array)															\
 		{																		\
@@ -276,7 +276,6 @@
     OSSet        * newSet;
     OSObject     * o;
     OSSymbol     * sym;
-    OSString     * str;
 
     size_t           bufferPos;
     const uint32_t * next;
@@ -396,7 +395,7 @@
 			if (sym)
 			{
 				DEBG("%s = %s\n", sym->getCStringNoCopy(), o->getMetaClass()->getClassName());
-				if (o != dict) ok = dict->setObject(sym, o, true);
+				if (o != dict) ok = dict->setObject(sym, o);
 				o->release();
 				sym->release();
 				sym = 0;
@@ -404,12 +403,6 @@
 			else 
 			{
 				sym = OSDynamicCast(OSSymbol, o);
-				if (!sym && (str = OSDynamicCast(OSString, o)))
-				{
-				    sym = (OSSymbol *) OSSymbol::withString(str);
-				    o->release();
-				    o = 0;
-				}
 				ok = (sym != 0);
 			}
 		}