fix truncation issues when dealing with unsigned long long types

gnagel · Mar 29, 2011 · 01965bc · 01965bc
1 parent e2c7307
commit 01965bc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/kernel.c b/kernel.c
@@ -782,6 +782,12 @@ rval_to_long_long(VALUE rval)
     return NUM2LL(rb_Integer(bool_to_fix(rval)));
 }
 
+static inline unsigned long long
+rval_to_ulong_long(VALUE rval)
+{
+    return NUM2ULL(rb_Integer(bool_to_fix(rval)));
+}
+
 static inline double
 rval_to_double(VALUE rval)
 {
@@ -849,13 +855,13 @@ vm_rval_to_ulong(VALUE rval, unsigned long *ocval)
 PRIMITIVE void
 vm_rval_to_long_long(VALUE rval, long long *ocval)
 {
-    *ocval = (long long)rval_to_long_long(rval);
+    *ocval = rval_to_long_long(rval);
 }
 
 PRIMITIVE void
 vm_rval_to_ulong_long(VALUE rval, unsigned long long *ocval)
 {
-    *ocval = (unsigned long long)rval_to_long_long(rval);
+    *ocval = rval_to_ulong_long(rval);
 }
 
 PRIMITIVE void

diff --git a/objc.m b/objc.m
@@ -561,7 +561,7 @@
 	    else {
 		long v = 0;
 		assert(CFNumberGetValue((CFNumberRef)obj, kCFNumberLongType, &v));
-		return LONG2FIX(v);
+		return LONG2NUM(v);
 	    }
 	}
 	else if (k == (Class)rb_cNSDate) {