--- xnu/xnu-12377.101.15/libkern/c++/OSString.cpp
+++ xnu/xnu-7195.121.3/libkern/c++/OSString.cpp
@@ -82,8 +82,7 @@
 	}
 
 	newLength++;
-	newString = (char *)kalloc_data(newLength,
-	    Z_VM_TAG_BT(Z_WAITOK, VM_KERN_MEMORY_LIBKERN));
+	newString = (char *)kalloc_data_container(newLength, Z_WAITOK);
 	if (!newString) {
 		return false;
 	}
@@ -91,7 +90,7 @@
 	bcopy(cString, newString, newLength);
 
 	if (!(flags & kOSStringNoCopy) && string) {
-		kfree_data(string, length);
+		kfree_data_container(string, length);
 		OSCONTAINER_ACCUMSIZE(-((size_t)length));
 	}
 	string = newString;
@@ -107,7 +106,6 @@
 OSString::initWithStringOfLength(const char *cString, size_t inlength)
 {
 	unsigned int   newLength;
-	unsigned int   cStringLength;
 	char         * newString;
 
 	if (!cString || !super::init()) {
@@ -118,15 +116,12 @@
 		return false;
 	}
 
-	cStringLength = (unsigned int)strnlen(cString, inlength);
-
-	if (cStringLength < inlength) {
-		inlength = cStringLength;
+	if (strnlen(cString, inlength) < inlength) {
+		return false;
 	}
 
 	newLength = (unsigned int) (inlength + 1);
-	newString = (char *)kalloc_data(newLength,
-	    Z_VM_TAG_BT(Z_WAITOK, VM_KERN_MEMORY_LIBKERN));
+	newString = (char *)kalloc_data_container(newLength, Z_WAITOK);
 	if (!newString) {
 		return false;
 	}
@@ -135,7 +130,7 @@
 	newString[inlength] = 0;
 
 	if (!(flags & kOSStringNoCopy) && string) {
-		kfree_data(string, length);
+		kfree_data_container(string, length);
 		OSCONTAINER_ACCUMSIZE(-((size_t)length));
 	}
 
@@ -204,7 +199,7 @@
 }
 
 OSSharedPtr<OSString>
-OSString::withCString(const char *cString, size_t length)
+OSString::withStringOfLength(const char *cString, size_t length)
 {
 	OSSharedPtr<OSString> me = OSMakeShared<OSString>();
 
@@ -250,7 +245,7 @@
 OSString::free()
 {
 	if (!(flags & kOSStringNoCopy) && string) {
-		kfree_data(string, length);
+		kfree_data_container(string, length);
 		OSCONTAINER_ACCUMSIZE(-((size_t)length));
 	}
 
@@ -330,7 +325,7 @@
 		return false;
 	}
 
-	unsigned int dataLen = obj->getLength();
+	unsigned int dataLen = obj->getLength();;
 	const char * dataPtr = (const char *) obj->getBytesNoCopy();
 
 	if (dataLen != length) {