From a88589c7d18c5004bb8b9f8191cb0d3aa3e5a705 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 10 Jul 2009 17:37:52 +0000 Subject: * random.c (limited_rand): expands to long before shift so that the result does not overflow. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24029 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ random.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2e659f3cb3..7440bcc23a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Jul 11 02:37:37 2009 Nobuyoshi Nakada + + * random.c (limited_rand): expands to long before shift so tha + the result does not overflow. + Sat Jul 11 00:16:27 2009 Nobuyoshi Nakada * random.c (rand_init): got rid of buffer overflow. diff --git a/random.c b/random.c index 3ae9197277..bcc16aa5b3 100644 --- a/random.c +++ b/random.c @@ -414,8 +414,8 @@ limited_rand(struct MT *mt, unsigned long limit) retry: val = 0; for (i = SIZEOF_LONG/4-1; 0 <= i; i--) { - if (mask >> (i * 32)) { - val |= genrand_int32(mt) << (i * 32); + if ((mask >> (i * 32)) & 0xffffffff) { + val |= (unsigned long)genrand_int32(mt) << (i * 32); val &= mask; if (limit < val) goto retry; -- cgit v1.2.1