--- xnu/xnu-12377.101.15/libkern/c++/OSArray.cpp
+++ xnu/xnu-8019.61.5/libkern/c++/OSArray.cpp
@@ -64,7 +64,8 @@
 		return false;
 	}
 
-	array = kallocp_type_container(ArrayPtrType, &inCapacity, Z_WAITOK_ZERO);
+	array = kalloc_type_tag_bt(ArrayPtrType, inCapacity, Z_WAITOK_ZERO,
+	    VM_KERN_MEMORY_LIBKERN);
 	if (!array) {
 		return false;
 	}
@@ -72,6 +73,8 @@
 	count = 0;
 	capacity = inCapacity;
 	capacityIncrement = (inCapacity)? inCapacity : 16;
+
+	os::uninitialized_value_construct(array, array + capacity);
 	OSCONTAINER_ACCUMSIZE(sizeof(*array) * inCapacity);
 
 	return true;
@@ -205,7 +208,7 @@
 OSArray::ensureCapacity(unsigned int newCapacity)
 {
 	ArraySharedPtrType *newArray;
-	unsigned int        finalCapacity;
+	vm_size_t    finalCapacity;
 
 	if (newCapacity <= capacity) {
 		return capacity;
@@ -220,12 +223,24 @@
 		return capacity;
 	}
 
-	newArray = kreallocp_type_container(ArrayPtrType, array,
-	    capacity, &finalCapacity, Z_WAITOK_ZERO);
+	newArray = kallocp_type_tag_bt(ArrayPtrType, &finalCapacity,
+	    Z_WAITOK, VM_KERN_MEMORY_LIBKERN);
 	if (newArray) {
+		// use all of the actual allocation size
+		if (finalCapacity > UINT_MAX) {
+			// failure, too large
+			kfree_type(ArrayPtrType, finalCapacity, newArray);
+			return capacity;
+		}
+
 		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;
+		capacity = (unsigned int) finalCapacity;
 	}
 
 	return capacity;