diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-13 13:53:22 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-13 13:53:22 +0000 |
commit | 9d0c732f0d6bd6927a8385c12312d9e054712958 (patch) | |
tree | 15dc58eb06be7b9579306b3198e64a697b99207f | |
parent | dc647aea2ea83622e22b94b11df60b18d6e3c31b (diff) | |
download | ruby-9d0c732f0d6bd6927a8385c12312d9e054712958.tar.gz |
* 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
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | numeric.c | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -1,4 +1,6 @@ -Wed Oct 13 22:51:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Oct 13 22:53:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * numeric.c (check_uint): get rid of overflow on LLP64 platforms. * insns.def (opt_case_dispatch): use st_data_t. @@ -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 { |