--- xnu/xnu-8019.41.5/libkern/c++/OSString.cpp
+++ xnu/xnu-7195.141.2/libkern/c++/OSString.cpp
@@ -106,7 +106,6 @@
 OSString::initWithStringOfLength(const char *cString, size_t inlength)
 {
 	unsigned int   newLength;
-	unsigned int   cStringLength;
 	char         * newString;
 
 	if (!cString || !super::init()) {
@@ -117,10 +116,8 @@
 		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);
@@ -202,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>();
 
@@ -328,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) {