--- xnu/xnu-4903.231.4/libkern/c++/OSString.cpp
+++ xnu/xnu-792.22.5/libkern/c++/OSString.cpp
@@ -56,6 +56,15 @@
 OSMetaClassDefineReservedUnused(OSString, 14);
 OSMetaClassDefineReservedUnused(OSString, 15);
 
+#if OSALLOCDEBUG
+extern "C" {
+    extern int debug_container_malloc_size;
+};
+#define ACCUMSIZE(s) do { debug_container_malloc_size += (s); } while(0)
+#else
+#define ACCUMSIZE(s)
+#endif
+
 bool OSString::initWithString(const OSString *aString)
 {
     return initWithCString(aString->string);
@@ -63,74 +72,29 @@
 
 bool OSString::initWithCString(const char *cString)
 {
-    unsigned int   newLength;
-    char         * newString;
-
-    if (!cString || !super::init()) return false;
-
-    newLength = strnlen(cString, kMaxStringLength);
-    if (newLength >= kMaxStringLength) return false;
-
-    newLength++;
-    newString = (char *) kalloc_container(newLength);
-    if (!newString) return false;
-
-    bcopy(cString, newString, newLength);
-
-    if ( !(flags & kOSStringNoCopy) && string) {
-        kfree(string, (vm_size_t)length);
-        OSCONTAINER_ACCUMSIZE(-((size_t)length));
-    }
-    string = newString;
-    length = newLength;
-    flags &= ~kOSStringNoCopy;
-
-    OSCONTAINER_ACCUMSIZE(length);
+    if (!cString || !super::init())
+        return false;
+
+    length = strlen(cString) + 1;
+    string = (char *) kalloc(length);
+    if (!string)
+        return false;
+
+    bcopy(cString, string, length);
+
+    ACCUMSIZE(length);
 
     return true;
 }
 
-bool OSString::initWithStringOfLength(const char *cString, size_t inlength)
-{
-    unsigned int   newLength;
-    char         * newString;
-
-    if (!cString || !super::init()) return false;
-
-    if (inlength >= kMaxStringLength) return false;
-
-    newLength = inlength + 1;
-    newString = (char *) kalloc_container(newLength);
-    if (!newString) return false;
-
-    bcopy(cString, newString, inlength);
-    newString[inlength] = 0;
-
-    if ( !(flags & kOSStringNoCopy) && string) {
-        kfree(string, (vm_size_t)length);
-        OSCONTAINER_ACCUMSIZE(-((size_t)length));
-    }
-
-    string = newString;
-    length = newLength;
-    flags &= ~kOSStringNoCopy;
-
-    OSCONTAINER_ACCUMSIZE(length);
-
-    return true;
-}
-
 bool OSString::initWithCStringNoCopy(const char *cString)
 {
     if (!cString || !super::init())
         return false;
 
-    length = strnlen(cString, kMaxStringLength);
-    if (length >= kMaxStringLength) return false;
-
-    length++;
+    length = strlen(cString) + 1;
     flags |= kOSStringNoCopy;
-    string = const_cast<char *>(cString);
+    string = (char *) cString;
 
     return true;
 }
@@ -170,20 +134,6 @@
 
     return me;
 }
-
-OSString *OSString::withStringOfLength(const char *cString, size_t length)
-{
-    OSString *me = new OSString;
-
-    if (me && !me->initWithStringOfLength(cString, length)) {
-        me->release();
-        return 0;
-    }
-
-    return me;
-}
-
-
 
 /* @@@ gvdl */
 #if 0
@@ -215,7 +165,7 @@
 {
     if ( !(flags & kOSStringNoCopy) && string) {
         kfree(string, (vm_size_t)length);
-        OSCONTAINER_ACCUMSIZE(-((size_t)length));
+        ACCUMSIZE(-length);
     }
 
     super::free();
@@ -258,7 +208,7 @@
 
 bool OSString::isEqualTo(const char *aCString) const
 {
-    return strncmp(string, aCString, length) == 0;
+    return strcmp(string, aCString) == 0;
 }
 
 bool OSString::isEqualTo(const OSMetaClassBase *obj) const
@@ -280,7 +230,7 @@
       return false;
 
     unsigned int dataLen = obj->getLength ();;
-    const char * dataPtr = (const char *) obj->getBytesNoCopy ();
+    char * dataPtr = (char *) obj->getBytesNoCopy ();
 
     if (dataLen != length) {