--- xnu/xnu-124.7/libkern/c++/OSNumber.cpp
+++ xnu/xnu-792.1.5/libkern/c++/OSNumber.cpp
@@ -21,16 +21,23 @@
  */
 /* IOOffset.m created by rsulack on Wed 17-Sep-1997 */
 
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+extern unsigned long strtoul(const char *, char **, int);
+__END_DECLS
+
 #include <libkern/c++/OSNumber.h>
 #include <libkern/c++/OSString.h>
 #include <libkern/c++/OSSerialize.h>
 #include <libkern/c++/OSLib.h>
 
-#define sizeMask ((1ULL << (size)) - 1)
+#define sizeMask (~0ULL >> (64 - size))
 
 #define super OSObject
 
 OSDefineMetaClassAndStructors(OSNumber, OSObject)
+
 OSMetaClassDefineReservedUnused(OSNumber, 0);
 OSMetaClassDefineReservedUnused(OSNumber, 1);
 OSMetaClassDefineReservedUnused(OSNumber, 2);
@@ -53,18 +60,7 @@
 
 bool OSNumber::init(const char *value, unsigned int numberOfBits)
 {
-    unsigned long long thisOffset;
-
-#ifdef q_works
-    sscanf(value, "%qi", thisOffset);
-#else
-    unsigned int smallOffset;
-
-    sscanf(value, "%i", &smallOffset);
-    thisOffset = smallOffset;
-#endif
-
-    return init(thisOffset, numberOfBits);
+    return init((unsigned long long)strtoul(value, NULL, 0), numberOfBits);
 }
 
 void OSNumber::free() { super::free(); }
@@ -75,7 +71,7 @@
     OSNumber *me = new OSNumber;
 
     if (me && !me->init(value, numberOfBits)) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -87,7 +83,7 @@
     OSNumber *me = new OSNumber;
 
     if (me && !me->init(value, numberOfBits)) {
-        me->free();
+        me->release();
         return 0;
     }