From 9d0c732f0d6bd6927a8385c12312d9e054712958 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 13 Oct 2010 13:53:22 +0000 Subject: * numeric.c (check_uint): get rid of overflow on LLP64 platforms. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29486 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 +++- numeric.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e192ae8e63..c4c3ba393c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ -Wed Oct 13 22:51:17 2010 Nobuyoshi Nakada +Wed Oct 13 22:53:19 2010 Nobuyoshi Nakada + + * numeric.c (check_uint): get rid of overflow on LLP64 platforms. * insns.def (opt_case_dispatch): use st_data_t. diff --git a/numeric.c b/numeric.c index 26ce683daa..9c82b20fe6 100644 --- a/numeric.c +++ b/numeric.c @@ -1824,7 +1824,7 @@ check_uint(VALUE num, VALUE sign) if (RTEST(sign)) { /* minus */ if ((num & mask) != mask || (num & ~mask) <= INT_MAX + 1UL) -#define VALUE_MSBMASK (1L << ((sizeof(VALUE) * CHAR_BIT) - 1)) +#define VALUE_MSBMASK ((VALUE)1 << ((sizeof(VALUE) * CHAR_BIT) - 1)) rb_raise(rb_eRangeError, "integer %"PRIdVALUE " too small to convert to `unsigned int'", num|VALUE_MSBMASK); } else { -- cgit v1.2.3