--- xnu/xnu-12377.101.15/libkern/c++/OSDictionary.cpp
+++ xnu/xnu-8019.41.5/libkern/c++/OSDictionary.cpp
@@ -93,11 +93,13 @@
 
 //fOptions |= kSort;
 
-	dictionary = kallocp_type_container(dictEntry, &inCapacity, Z_WAITOK_ZERO);
+	dictionary = kalloc_type_tag_bt(dictEntry, inCapacity, Z_WAITOK_ZERO,
+	    VM_KERN_MEMORY_LIBKERN);
 	if (!dictionary) {
 		return false;
 	}
 
+	os::uninitialized_value_construct(dictionary, dictionary + inCapacity);
 	OSCONTAINER_ACCUMSIZE(inCapacity * sizeof(dictEntry));
 
 	count = 0;
@@ -316,7 +318,7 @@
 OSDictionary::ensureCapacity(unsigned int newCapacity)
 {
 	dictEntry *newDict;
-	unsigned int finalCapacity;
+	vm_size_t finalCapacity;
 
 	if (newCapacity <= capacity) {
 		return capacity;
@@ -331,12 +333,25 @@
 		return capacity;
 	}
 
-	newDict = kreallocp_type_container(dictEntry, dictionary,
-	    capacity, &finalCapacity, Z_WAITOK_ZERO);
+	newDict = kallocp_type_tag_bt(dictEntry, &finalCapacity, Z_WAITOK,
+	    VM_KERN_MEMORY_LIBKERN);
 	if (newDict) {
+		// use all of the actual allocation size
+		if (finalCapacity > UINT_MAX) {
+			// failure, too large
+			kfree_type(dictEntry, finalCapacity, newDict);
+			return capacity;
+		}
+
+		os::uninitialized_move(dictionary, dictionary + capacity, newDict);
+		os::uninitialized_value_construct(newDict + capacity, newDict + finalCapacity);
+		os::destroy(dictionary, dictionary + capacity);
+
 		OSCONTAINER_ACCUMSIZE(sizeof(dictEntry) * (finalCapacity - capacity));
+
+		kfree_type(dictEntry, capacity, dictionary);
 		dictionary = newDict;
-		capacity = finalCapacity;
+		capacity = (unsigned int) finalCapacity;
 	}
 
 	return capacity;
@@ -348,8 +363,8 @@
 	haveUpdated();
 
 	for (unsigned int i = 0; i < count; i++) {
-		dictionary[i].key.reset();
-		dictionary[i].value.reset();
+		dictionary[i].key->taggedRelease(OSTypeID(OSCollection));
+		dictionary[i].value->taggedRelease(OSTypeID(OSCollection));
 	}
 	count = 0;
 }