Loading...
libkern/c++/OSArray.cpp xnu-8020.121.3 xnu-10002.41.9
--- xnu/xnu-8020.121.3/libkern/c++/OSArray.cpp
+++ xnu/xnu-10002.41.9/libkern/c++/OSArray.cpp
@@ -72,8 +72,6 @@
 	count = 0;
 	capacity = inCapacity;
 	capacityIncrement = (inCapacity)? inCapacity : 16;
-
-	os::uninitialized_value_construct(array, array + capacity);
 	OSCONTAINER_ACCUMSIZE(sizeof(*array) * inCapacity);
 
 	return true;
@@ -222,14 +220,10 @@
 		return capacity;
 	}
 
-	newArray = kallocp_type_container(ArrayPtrType, &finalCapacity, Z_WAITOK);
+	newArray = kreallocp_type_container(ArrayPtrType, array,
+	    capacity, &finalCapacity, Z_WAITOK_ZERO);
 	if (newArray) {
 		OSCONTAINER_ACCUMSIZE(sizeof(*array) * (finalCapacity - capacity));
-
-		os::uninitialized_move(array, array + capacity, newArray);
-		os::uninitialized_value_construct(newArray + capacity, newArray + finalCapacity);
-		os::destroy(array, array + capacity);
-		kfree_type(ArrayPtrType, capacity, array);
 		array = newArray;
 		capacity = finalCapacity;
 	}