From e79fbf3dfef38883a4173b4d1a58448343407f2f Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 13 Oct 2010 05:58:35 +0000 Subject: [PATCH] * numeric.c (rb_num_to_uint): fix 32bit logic. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29481 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ numeric.c | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e8646db1b..e941dda1cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Oct 13 14:58:09 2010 NARUSE, Yui + + * numeric.c (rb_num_to_uint): fix 32bit logic. + Wed Oct 13 12:53:43 2010 NARUSE, Yui * numeric.c (rb_num_to_uint): added to check the range of arguments. diff --git a/numeric.c b/numeric.c index 4b3cf595cb..c27187f4f4 100644 --- a/numeric.c +++ b/numeric.c @@ -122,7 +122,9 @@ rb_num_to_uint(VALUE val, unsigned int *ret) #define NUMERR_TOOLARGE 3 if (FIXNUM_P(val)) { long v = FIX2LONG(val); - if (v > UINT_MAX) return NUMERR_TOOLARGE; +#if SIZEOF_INT < SIZEOF_LONG + if (v > (long)UINT_MAX) return NUMERR_TOOLARGE; +#endif if (v < 0) return NUMERR_NEGATIVE; *ret = (unsigned int)v; return 0; @@ -136,7 +138,8 @@ rb_num_to_uint(VALUE val, unsigned int *ret) return NUMERR_TOOLARGE; #else /* long is 32bit */ - if (RBIGNUM_LEN(x) > DIGSPERLONG) return NUMERR_TOOLARGE; +#define DIGSPERLONG (SIZEOF_LONG/SIZEOF_BDIGITS) + if (RBIGNUM_LEN(val) > DIGSPERLONG) return NUMERR_TOOLARGE; *ret = (unsigned int)rb_big2ulong((VALUE)val); return 0; #endif