aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-10-12 08:56:00 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-10-12 08:56:00 +0000
commit2d8612e9666a9fb0ddf240b2920dc4cf69632ad8 (patch)
tree2ad61214f3b5e1e99e6758ded65ed066554a2e20
parent232257238acfaf3c34f3e6c4b2d6e1200fd217e8 (diff)
downloadruby-2d8612e9666a9fb0ddf240b2920dc4cf69632ad8.tar.gz
* numeric (check_uint): the mask must refer to VALUE.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29452 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--numeric.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 29cf0c5716..850daf3d5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Oct 12 17:53:49 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * numeric (check_uint): the mask must refer to VALUE.
+
Tue Oct 12 17:47:10 2010 NARUSE, Yui <naruse@ruby-lang.org>
* numeric (check_uint): set MSB for negative value.
diff --git a/numeric.c b/numeric.c
index 9b01acfd10..65d501ae1e 100644
--- a/numeric.c
+++ b/numeric.c
@@ -1791,8 +1791,8 @@ check_uint(VALUE num, VALUE sign)
if (RTEST(sign)) {
/* minus */
if ((num & mask) != mask || (num & ~mask) <= INT_MAX + 1UL)
-#define MSBMASK (1L << ((sizeof(long) * CHAR_BIT) - 1))
- rb_raise(rb_eRangeError, "integer %"PRIdVALUE " too small to convert to `unsigned int'", num|MSBMASK);
+#define VALUE_MSBMASK (1L << ((sizeof(VALUE) * CHAR_BIT) - 1))
+ rb_raise(rb_eRangeError, "integer %"PRIdVALUE " too small to convert to `unsigned int'", num|VALUE_MSBMASK);
}
else {
/* plus */