--- xnu/xnu-344.49/libkern/c++/OSString.cpp
+++ xnu/xnu-1699.32.7/libkern/c++/OSString.cpp
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* IOString.m created by rsulack on Wed 17-Sep-1997 */
 /* IOString.cpp converted to C++ on Tue 1998-9-22 */
@@ -91,7 +94,7 @@
 
     length = strlen(cString) + 1;
     flags |= kOSStringNoCopy;
-    string = (char *) cString;
+    string = const_cast<char *>(cString);
 
     return true;
 }
@@ -101,7 +104,7 @@
     OSString *me = new OSString;
 
     if (me && !me->initWithString(aString)) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -113,7 +116,7 @@
     OSString *me = new OSString;
 
     if (me && !me->initWithCString(cString)) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -125,7 +128,7 @@
     OSString *me = new OSString;
 
     if (me && !me->initWithCStringNoCopy(cString)) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -161,7 +164,7 @@
 void OSString::free()
 {
     if ( !(flags & kOSStringNoCopy) && string) {
-        kfree((vm_offset_t)string, (vm_size_t)length);
+        kfree(string, (vm_size_t)length);
         ACCUMSIZE(-length);
     }
 
@@ -205,7 +208,7 @@
 
 bool OSString::isEqualTo(const char *aCString) const
 {
-    return strcmp(string, aCString) == 0;
+    return strncmp(string, aCString, length) == 0;
 }
 
 bool OSString::isEqualTo(const OSMetaClassBase *obj) const